highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vp56: Release old pictures after a resolution changes

Browse Source 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
(cherry picked from commit 3d09d0017d)

Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Laurent Aimar
2011-09-21 20:46:33 +02:00
committed by Reinhard Tartler
parent efe3fb13a7
commit 3e1b5981ba
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/vp56.c
View File

@@ -465,6 +465,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;
} }
@@ -513,6 +514,18 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
if (!res) if (!res)
return -1; 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) { if (!is_alpha) {
p->reference = 1; p->reference = 1;
if (avctx->get_buffer(avctx, p) < 0) { if (avctx->get_buffer(avctx, p) < 0) {