diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-21 20:46:33 +0200 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2011-10-07 00:27:24 +0200 |
| commit | 3d09d0017d10a0d738141a955c75c555133e41b2 (patch) | |
| tree | 15cc79797fb2f2a7e73c397a814f688886a09b21 /libavcodec/vp56.c | |
| parent | 066fff755a5d8edc660c010ddb08474d208eeade (diff) | |
| download | ffmpeg-3d09d0017d10a0d738141a955c75c555133e41b2.tar.gz | |
vp56: Release old pictures after a resolution changes
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
Diffstat (limited to 'libavcodec/vp56.c')
| -rw-r--r-- | libavcodec/vp56.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index e18c59ef66..3b2ac95837 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; } @@ -515,6 +516,18 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size, if (!res) return -1; + if (res == 2) { + int i; + for (i = 0; i < 4; i++) { + if (s->frames[i].data[0]) + avctx->release_buffer(avctx, &s->frames[i]); + } + if (is_alpha) { + avcodec_set_dimensions(avctx, 0, 0); + return -1; + } + } + if (!is_alpha) { p->reference = 1; if (avctx->get_buffer(avctx, p) < 0) { |