diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-24 16:16:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-10-01 20:23:03 +0200 |
| commit | be22dc60f55bb99dcb0a90ad2e8773612a63a288 (patch) | |
| tree | 4b7c2115aa3009a684cb8d37e7e3981ed274f1d8 | |
| parent | 35f8ad420a0b7ebcade81c2be3ca5968a5861ddc (diff) | |
| download | ffmpeg-be22dc60f55bb99dcb0a90ad2e8773612a63a288.tar.gz | |
vp56:Fix error recovery code on size changes in vp5/6 decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1aad9cd9d26adcca1d398a4cb3d67f89a6fa8967)
| -rw-r--r-- | libavcodec/vp56.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index 30f3efbc46..5b787b6135 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -465,6 +465,7 @@ static int vp56_size_changed(AVCodecContext *avctx) s->mb_height = (avctx->coded_height+15) / 16; if (s->mb_width > 1000 || s->mb_height > 1000) { + avcodec_set_dimensions(avctx, 0, 0); av_log(avctx, AV_LOG_ERROR, "picture too big\n"); return -1; } @@ -519,8 +520,10 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size, if (s->frames[i].data[0]) avctx->release_buffer(avctx, &s->frames[i]); } - if (is_alpha) + if (is_alpha) { + avcodec_set_dimensions(avctx, 0, 0); return -1; + } } if (!is_alpha) { |