diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-28 10:57:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-28 11:21:52 +0100 |
| commit | 03beb5792a3c714715c795b5c680d39bca6b0427 (patch) | |
| tree | f824d4ba798c1e220b708f20c8d290dbc63ad6c6 /libavcodec | |
| parent | 0a5ca63c24b8a07f94611637ba29e41b8b47ce24 (diff) | |
| parent | 873379939299046b30cdec26a837171029ef8099 (diff) | |
| download | ffmpeg-03beb5792a3c714715c795b5c680d39bca6b0427.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h263dec: sanitize a condition.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h263dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index f8785d2fbb..b91d8d5145 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -459,7 +459,7 @@ retry: ret = ff_wmv2_decode_picture_header(s); } else if (CONFIG_MSMPEG4_DECODER && s->msmpeg4_version) { ret = ff_msmpeg4_decode_picture_header(s); - } else if (CONFIG_MPEG4_DECODER && s->h263_pred) { + } else if (CONFIG_MPEG4_DECODER && avctx->codec_id == AV_CODEC_ID_MPEG4) { if (s->avctx->extradata_size && s->picture_number == 0) { GetBitContext gb; |