[2/4] libavcodec: Handle param change side data in avcodec_decode_video2, too

Message ID 1325848585-98200-2-git-send-email-martin@martin.st
State Committed
Commit c5d907b6b03ef431b9901fc9090887b03fd7a09a
Headers show

Commit Message

Martin Storsjö Jan. 6, 2012, 11:16 a.m.
Also call avcodec_set_dimensions on dimension param change packets.
---
 libavcodec/utils.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

Comments

Paul B Mahol Jan. 6, 2012, 3:47 p.m. | #1
On 1/6/12, Martin Storsjoe <martin@martin.st> wrote:
> Also call avcodec_set_dimensions on dimension param change packets.
> ---
>  libavcodec/utils.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)

OK

Patch

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index a1d2a01..2bc1dcf 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)