[FFmpeg-cvslog] svq3: initialize some required H264Context fields.

Anton Khirnov git at videolan.org
Mon Apr 6 01:50:51 CEST 2015


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sun Apr  5 21:02:56 2015 +0200| [249796e2560c2cce1add722c3e873de96b17be74] | committer: Anton Khirnov

svq3: initialize some required H264Context fields.

They are no longer initialized in ff_h264_decode_init() since 43fd3dd,
so svq3 needs to initialize the manually.

Fixes svq3 decoding, broken since 43fd3dd.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=249796e2560c2cce1add722c3e873de96b17be74
---

 libavcodec/svq3.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index 00e7c89..6c877bd 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -887,6 +887,18 @@ static av_cold int svq3_decode_init(AVCodecContext *avctx)
     if (ff_h264_decode_init(avctx) < 0)
         return -1;
 
+    ff_h264dsp_init(&h->h264dsp, 8, 1);
+    ff_h264chroma_init(&h->h264chroma, 8);
+    ff_h264qpel_init(&h->h264qpel, 8);
+    ff_h264_pred_init(&h->hpc, AV_CODEC_ID_SVQ3, 8, 1);
+    ff_videodsp_init(&h->vdsp, 8);
+
+    memset(h->pps.scaling_matrix4, 16, 6 * 16 * sizeof(uint8_t));
+    memset(h->pps.scaling_matrix8, 16, 2 * 64 * sizeof(uint8_t));
+
+    h->sps.bit_depth_luma = 8;
+    h->chroma_format_idc = 1;
+
     ff_hpeldsp_init(&s->hdsp, avctx->flags);
     ff_tpeldsp_init(&s->tdsp);
 



More information about the ffmpeg-cvslog mailing list