aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2007-02-02 15:14:13 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2007-02-02 15:14:13 +0000
commit8165ee939434ffc9ea9b95d01ce6cb75615223a4 (patch)
tree3ee445db317291cd4d20fee144e692a606530393
parenta836a2c8b2083dd4018b73f5b59ecdd15ef5b299 (diff)
downloadffmpeg-8165ee939434ffc9ea9b95d01ce6cb75615223a4.tar.gz
0x00000103 is not an escape marker
Originally committed as revision 7807 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/vc1.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 722e885144..af2256b3fc 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -50,7 +50,6 @@ static const uint16_t table_mb_intra[64][2];
//@{
enum VC1Code{
VC1_CODE_RES0 = 0x00000100,
- VC1_CODE_ESCAPE = 0x00000103,
VC1_CODE_ENDOFSEQ = 0x0000010A,
VC1_CODE_SLICE,
VC1_CODE_FIELD,
@@ -4107,7 +4106,7 @@ static void vc1_decode_blocks(VC1Context *v)
}
}
-#define IS_MARKER(x) ((((x) & ~0xFF) == VC1_CODE_RES0) && ((x) != VC1_CODE_ESCAPE))
+#define IS_MARKER(x) (((x) & ~0xFF) == VC1_CODE_RES0)
/** Find VC-1 marker in buffer
* @return position where next marker starts or end of buffer if no marker found