Browse Source

vp56dec: Fix handling of alpha configuration changes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.1
Michael Niedermayer 13 years ago
parent
commit
9195377bc5
1 changed files with 10 additions and 1 deletions
  1. +10
    -1
      libavcodec/vp56.c

+ 10
- 1
libavcodec/vp56.c View File

@@ -552,7 +552,16 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,

res = s->alpha_context->parse_header(s->alpha_context, buf, remaining_buf_size);
if (res != 1) {
avctx->release_buffer(avctx, p);
if(res==2) {
av_log(avctx, AV_LOG_ERROR, "Alpha reconfiguration\n");
for (i = 0; i < 4; i++) {
if (s->frames[i].data[0])
avctx->release_buffer(avctx, &s->frames[i]);
av_assert0(!s->alpha_context->frames[i].data[0]);
}
vp56_size_changed(s);
}else
avctx->release_buffer(avctx, p);
return -1;
}
}


Loading…
Cancel
Save