From c5d907b6b03ef431b9901fc9090887b03fd7a09a Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Fri, 6 Jan 2012 03:06:25 +0200 Subject: libavcodec: Handle param change side data in avcodec_decode_video2, too MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also call avcodec_set_dimensions on dimension param change packets. Signed-off-by: Martin Storsjö --- libavcodec/utils.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'libavcodec/utils.c') diff --git a/libavcodec/utils.c b/libavcodec/utils.c index a1d2a01266..2bc1dcf5da 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -879,6 +879,7 @@ static void apply_param_change(AVCodecContext *avctx, AVPacket *avpkt) return; avctx->width = bytestream_get_le32(&data); avctx->height = bytestream_get_le32(&data); + avcodec_set_dimensions(avctx, avctx->width, avctx->height); size -= 8; } } @@ -894,6 +895,7 @@ int attribute_align_arg avcodec_decode_video2(AVCodecContext *avctx, AVFrame *pi return -1; avctx->pkt = avpkt; + apply_param_change(avctx, avpkt); if((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size || (avctx->active_thread_type&FF_THREAD_FRAME)){ if (HAVE_THREADS && avctx->active_thread_type&FF_THREAD_FRAME) -- cgit v1.2.3