Index: source/libvpx/vp9/common/vp9_common.h |
=================================================================== |
--- source/libvpx/vp9/common/vp9_common.h (revision 232232) |
+++ source/libvpx/vp9/common/vp9_common.h (working copy) |
@@ -40,8 +40,8 @@ |
vpx_memcpy(dest, src, n * sizeof(*src)); \ |
} |
-#define vp9_zero(dest) vpx_memset(&dest, 0, sizeof(dest)); |
-#define vp9_zero_array(dest, n) vpx_memset(dest, 0, n * sizeof(*dest)); |
+#define vp9_zero(dest) vpx_memset(&dest, 0, sizeof(dest)) |
+#define vp9_zero_array(dest, n) vpx_memset(dest, 0, n * sizeof(*dest)) |
static INLINE uint8_t clip_pixel(int val) { |
return (val > 255) ? 255u : (val < 0) ? 0u : val; |
@@ -84,9 +84,11 @@ |
} while (0) |
#endif |
-#define SYNC_CODE_0 0x49 |
-#define SYNC_CODE_1 0x83 |
-#define SYNC_CODE_2 0x42 |
+#define VP9_SYNC_CODE_0 0x49 |
+#define VP9_SYNC_CODE_1 0x83 |
+#define VP9_SYNC_CODE_2 0x42 |
+#define VP9_FRAME_MARKER 0x2 |
+ |
#endif // VP9_COMMON_VP9_COMMON_H_ |