aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Aimar <fenrir@videolan.org>2011-09-21 20:46:33 +0200
committerMichael Niedermayer <michaelni@gmx.at>2011-11-06 18:40:47 +0100
commitb24c2e59fec0342a57af86eaec3080e264894276 (patch)
treee33bda696f6185e26890e3615f4d40e80127bfd9
parent25bc1108c2d3466358da8d3e27d08dbdb9840ea2 (diff)
downloadffmpeg-b24c2e59fec0342a57af86eaec3080e264894276.tar.gz
Release old pictures after a resolution change in vp5/6 decoder
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit dba20b84784a7931b7eac50ced1d43e86801bde9) (cherry picked from commit c9c6e5f4e8680b7b7801dd6943590ae9cd6bfd89) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/vp56.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c
index ad11b5289a..65ddb8b421 100644
--- a/libavcodec/vp56.c
+++ b/libavcodec/vp56.c
@@ -519,6 +519,16 @@ int 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)
+ return -1;
+ }
+
if (!is_alpha) {
p->reference = 1;
if (avctx->get_buffer(avctx, p) < 0) {