diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 12:07:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 12:09:12 +0100 |
| commit | a66ee3dc87c5650016df7dcd00c4ce0202f0c3ce (patch) | |
| tree | 9b8ef203d5c422de8306806f49cff25fe3b7ef22 | |
| parent | d57a6fe6abdab934063b809e43096bf887d01696 (diff) | |
| parent | aaaf2dc023d31f30eeec874f24b50f44b9295185 (diff) | |
| download | ffmpeg-a66ee3dc87c5650016df7dcd00c4ce0202f0c3ce.tar.gz | |
Merge commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185'
* commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185':
h263: Check init_get_bits return value
Conflicts:
libavcodec/h263dec.c
See: d47e14b53a3908e5bad82e22129bbd175b49e89b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h263dec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index e2fb199dd2..a5955b7acb 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -429,7 +429,8 @@ retry: } if (s->bitstream_buffer_size && (s->divx_packed || buf_size < 20)) // divx 5.01+/xvid frame reorder - ret = init_get_bits8(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size); + ret = init_get_bits8(&s->gb, s->bitstream_buffer, + s->bitstream_buffer_size); else ret = init_get_bits8(&s->gb, buf, buf_size); @@ -461,7 +462,7 @@ retry: GetBitContext gb; if (init_get_bits8(&gb, s->avctx->extradata, s->avctx->extradata_size) >= 0 ) - ret = ff_mpeg4_decode_picture_header(s, &gb); + ff_mpeg4_decode_picture_header(s, &gb); } ret = ff_mpeg4_decode_picture_header(s, &s->gb); } else if (CONFIG_H263I_DECODER && s->codec_id == AV_CODEC_ID_H263I) { |