Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / h264_mb_template.c

diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c
index a11009412c96f81029037cf679c5c4f3e38ab1db..34e63dcc325e7f02be8a78300edfbf2ac47b8a55 100644 (file)
--- a/libavcodec/h264_mb_template.c
+++ b/libavcodec/h264_mb_template.c
@@ -52,7 +52,7 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
     const int transform_bypass = !SIMPLE && (s->qscale == 0 && h->sps.transform_bypass);
     /* is_h264 should always be true if SVQ3 is disabled. */
     const int is_h264 = !CONFIG_SVQ3_DECODER || SIMPLE || s->codec_id == AV_CODEC_ID_H264;
-    void (*idct_add)(uint8_t *dst, DCTELEM *block, int stride);
+    void (*idct_add)(uint8_t *dst, int16_t *block, int stride);
     const int block_h   = 16 >> s->chroma_y_shift;
     const int chroma422 = CHROMA422;