aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/indeo5.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-06 18:49:35 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-06 19:04:27 +0200
commit0ca3dbbfcef0de304b6c6458787edbefc7a004d1 (patch)
tree71d80ecb8a5aefb75b6c3d2831db0e2ba9f449a0 /libavcodec/indeo5.c
parent82c6b76d701a44941da47fb60ddf13d94769b91e (diff)
parenta248117f2618e9e4de3c87e685bce44578b11657 (diff)
downloadffmpeg-0ca3dbbfcef0de304b6c6458787edbefc7a004d1.tar.gz
Merge tag 'n0.8.15' into release/0.7
FFmpeg 0.8.15 release * tag 'n0.8.15': (49 commits) update for 0.8.15 avcodec/ffv1enc: update buffer check for 16bps avcodec/dsputil: fix signedness in sizeof() comparissions avcodec/pngdsp: fix (un)signed type in end comparission matroska_read_seek: Fix used streams for subtitle index compensation jpeg2000: check log2_cblk dimensions avcodec/rpza: Perform pointer advance and checks before using the pointers update all trac links to use the trac subdomain doc/APIchanges: List merge commit hashes and version numbers apichanges: fix 2 wrong hashes avcodec/parser: reset indexes on realloc failure mpeg12dec: avoid reinitialization on PS changes when possible. mpegts: only reopen pmt_cb filter if its different from the previous. Autodetect idcin only if audio properties allow decoding. alacenc: Fix missing sign_extend() h264_cavlc: fix reading skip run Update changelog for 0.7.8 release aac: check the maximum number of channels oggdec: fix faulty cleanup prototype qdm2: check that the FFT size is a power of 2 ... Conflicts: Doxyfile RELEASE VERSION libavformat/matroskadec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo5.c')
-rw-r--r--libavcodec/indeo5.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c
index 15fad5872b..1f454a32c2 100644
--- a/libavcodec/indeo5.c
+++ b/libavcodec/indeo5.c
@@ -804,6 +804,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
avctx->release_buffer(avctx, &ctx->frame);
ctx->frame.reference = 0;
+ avcodec_set_dimensions(avctx, ctx->planes[0].width, ctx->planes[0].height);
if (avctx->get_buffer(avctx, &ctx->frame) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return -1;