diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-24 16:16:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-24 19:13:37 +0200 |
| commit | 1aad9cd9d26adcca1d398a4cb3d67f89a6fa8967 (patch) | |
| tree | 9807a29c01d03f98f4297ab5b29f57de26b50db3 /libavcodec | |
| parent | 91f104496bb7632ed5ff03798e06dd8af014f0d9 (diff) | |
| download | ffmpeg-1aad9cd9d26adcca1d398a4cb3d67f89a6fa8967.tar.gz | |
vp56:Fix error recovery code on size changes in vp5/6 decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 996eba0040..dbbbd54c02 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -467,6 +467,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; } @@ -521,8 +522,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) { |