diff options
| author | Laurent Aimar <fenrir@videolan.org> | 2011-09-21 20:46:33 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2012-03-18 17:50:30 +0100 |
| commit | 3e1b5981ba11a5eb317282078766ebb9e57b7781 (patch) | |
| tree | e52c15696dd00d6b9ab1643c56af30976486e00b /libavcodec/vp56.c | |
| parent | efe3fb13a79957ea94f2766c3f3e502ae775eace (diff) | |
| download | ffmpeg-3e1b5981ba11a5eb317282078766ebb9e57b7781.tar.gz | |
vp56: Release old pictures after a resolution changes
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
(cherry picked from commit 3d09d0017d10a0d738141a955c75c555133e41b2)
Signed-off-by: Anton Khirnov <anton@khirnov.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 4fd1341bdb..dd9dd77527 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; } @@ -513,6 +514,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) { |