Skip to content

F
ffmpeg
Commit 1aad9cd9 authored by Laurent Aimar's avatar Laurent Aimar Committed by Michael Niedermayer
Browse files
Options

vp56:Fix error recovery code on size changes in vp5/6 decoder 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 91f10449
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 1 deletion
libavcodec/vp56.c
View file @ 1aad9cd9
...@@ -467,6 +467,7 @@ static int vp56_size_changed(AVCodecContext *avctx) ...@@ -467,6 +467,7 @@ static int vp56_size_changed(AVCodecContext *avctx)
s->mb_height = (avctx->coded_height+15) / 16; s->mb_height = (avctx->coded_height+15) / 16;
if (s->mb_width > 1000 || s->mb_height > 1000) { 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"); av_log(avctx, AV_LOG_ERROR, "picture too big\n");
return -1; return -1;
} }
...@@ -521,8 +522,10 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size, ...@@ -521,8 +522,10 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
if (s->frames[i].data[0]) if (s->frames[i].data[0])
avctx->release_buffer(avctx, &s->frames[i]); avctx->release_buffer(avctx, &s->frames[i]);
} }
if (is_alpha) if (is_alpha) {
avcodec_set_dimensions(avctx, 0, 0);
return -1; return -1;
}
} }
if (!is_alpha) { if (!is_alpha) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment