diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-19 04:13:37 +0100 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-05-23 20:44:57 +0200 |
| commit | 2f2fd8c6d1c51a6b817e6c0bc4eff308b8f9cd18 (patch) | |
| tree | 41d5f2867ae69ffbdd0002020f11c4031a83ca32 | |
| parent | c5f7c755cfccd7aa01010a2d566104c2b0fa6d86 (diff) | |
| download | ffmpeg-2f2fd8c6d1c51a6b817e6c0bc4eff308b8f9cd18.tar.gz | |
tqi: Pass errors from the MB decoder
This silences some valgrind warnings.
CC: libav-stable@libav.org
Fixes second half of http://ffmpeg.org/trac/ffmpeg/ticket/794
Bug found by: Oana Stratulat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit f85334f58e1286287d0547a49fa9c93b40cbf48f)
(cherry picked from commit 90290a5150e84fb138ccde57657dc03830f08c1c)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
(cherry picked from commit 5872580e65aab026b77754eb184f97ba7cc6ea35)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavcodec/eatqi.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index aa96437013..6c5604820a 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -59,12 +59,15 @@ static av_cold int tqi_decode_init(AVCodecContext *avctx) return 0; } -static void tqi_decode_mb(MpegEncContext *s, DCTELEM (*block)[64]) +static int tqi_decode_mb(MpegEncContext *s, DCTELEM (*block)[64]) { int n; s->dsp.clear_blocks(block[0]); for (n=0; n<6; n++) - ff_mpeg1_decode_block_intra(s, block[n], n); + if (ff_mpeg1_decode_block_intra(s, block[n], n) < 0) + return -1; + + return 0; } static inline void tqi_idct_put(TqiContext *t, DCTELEM (*block)[64]) @@ -136,7 +139,8 @@ static int tqi_decode_frame(AVCodecContext *avctx, for (s->mb_y=0; s->mb_y<(avctx->height+15)/16; s->mb_y++) for (s->mb_x=0; s->mb_x<(avctx->width+15)/16; s->mb_x++) { - tqi_decode_mb(s, t->block); + if (tqi_decode_mb(s, t->block) < 0) + break; tqi_idct_put(t, t->block); } |