diff options
| author | Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> | 2015-04-03 19:14:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-04 02:23:58 +0200 |
| commit | f62880bfb8c72ccbfdce4dd9daf93af691060ddd (patch) | |
| tree | 67cadf9f9b4d99a58e2d1d3be1d71c5bcd0be148 /libavcodec | |
| parent | 241913c0d041e09ddded851a47e0a4a7d6f88561 (diff) | |
| download | ffmpeg-f62880bfb8c72ccbfdce4dd9daf93af691060ddd.tar.gz | |
mpeg4: use a self-explanatory #define MAX_NVOP_SIZE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h263dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpeg4video.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index a1981a3cf8..c28a465651 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -459,7 +459,7 @@ retry: } } - if (s->bitstream_buffer_size && (s->divx_packed || buf_size < 20)) // divx 5.01+/xvid frame reorder + if (s->bitstream_buffer_size && (s->divx_packed || buf_size <= MAX_NVOP_SIZE)) // divx 5.01+/xvid frame reorder ret = init_get_bits8(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size); else diff --git a/libavcodec/mpeg4video.h b/libavcodec/mpeg4video.h index e83692cc87..43650bb007 100644 --- a/libavcodec/mpeg4video.h +++ b/libavcodec/mpeg4video.h @@ -59,6 +59,9 @@ #define VISUAL_OBJ_STARTCODE 0x1B5 #define VOP_STARTCODE 0x1B6 +/* smaller packets likely don't contain a real frame */ +#define MAX_NVOP_SIZE 19 + typedef struct Mpeg4DecContext { MpegEncContext m; |