From: Yaowu Xu <yaowu@google.com>
Date: Wed, 20 Jan 2016 23:44:37 +0000 (-0800)
Subject: VP9_FRAME_MARKER -> VPX_FRAME_MARKER
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=03568c313bb2a2afb32f0e833fbf6a022dbfde10;p=libvpx

VP9_FRAME_MARKER -> VPX_FRAME_MARKER

Change-Id: I402faf4e8df60f02d82ad79dc725722b4e1f8f9c
---

diff --git a/vp10/common/common.h b/vp10/common/common.h
index 4abcbf633..a984113c2 100644
--- a/vp10/common/common.h
+++ b/vp10/common/common.h
@@ -65,7 +65,7 @@ static INLINE int get_unsigned_bits(unsigned int num_values) {
 #define VP10_SYNC_CODE_1 0x83
 #define VP10_SYNC_CODE_2 0x43
 
-#define VP9_FRAME_MARKER 0x2
+#define VPX_FRAME_MARKER 0x2
 
 
 #ifdef __cplusplus
diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c
index 06af4314d..e8c3bf2a0 100644
--- a/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -1868,7 +1868,7 @@ static size_t read_uncompressed_header(VP10Decoder *pbi,
   cm->last_frame_type = cm->frame_type;
   cm->last_intra_only = cm->intra_only;
 
-  if (vpx_rb_read_literal(rb, 2) != VP9_FRAME_MARKER)
+  if (vpx_rb_read_literal(rb, 2) != VPX_FRAME_MARKER)
       vpx_internal_error(&cm->error, VPX_CODEC_UNSUP_BITSTREAM,
                          "Invalid frame marker");
 
diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index ede8bb370..16b0e0b91 100644
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -1271,7 +1271,7 @@ static void write_uncompressed_header(VP10_COMP *cpi,
   VP10_COMMON *const cm = &cpi->common;
   MACROBLOCKD *const xd = &cpi->td.mb.e_mbd;
 
-  vpx_wb_write_literal(wb, VP9_FRAME_MARKER, 2);
+  vpx_wb_write_literal(wb, VPX_FRAME_MARKER, 2);
 
   write_profile(cm->profile, wb);
 
diff --git a/vp10/vp10_dx_iface.c b/vp10/vp10_dx_iface.c
index 33337a4bd..07d218965 100644
--- a/vp10/vp10_dx_iface.c
+++ b/vp10/vp10_dx_iface.c
@@ -197,7 +197,7 @@ static vpx_codec_err_t decoder_peek_si_internal(const uint8_t *data,
     const int frame_marker = vpx_rb_read_literal(&rb, 2);
     const BITSTREAM_PROFILE profile = vp10_read_profile(&rb);
 
-    if (frame_marker != VP9_FRAME_MARKER)
+    if (frame_marker != VPX_FRAME_MARKER)
       return VPX_CODEC_UNSUP_BITSTREAM;
 
     if (profile >= MAX_PROFILES)