Merge commit '8729698d50739524665090e083d1bfdf28235724'

[ffmpeg] / libavcodec / h264_mb_template.c

diff --git a/libavcodec/h264_mb_template.c b/libavcodec/h264_mb_template.c
index b6adbf7cebe23ce2b1f9798f08c9f3bdf0e2d64e..a11009412c96f81029037cf679c5c4f3e38ab1db 100644 (file)
--- a/libavcodec/h264_mb_template.c
+++ b/libavcodec/h264_mb_template.c
@@ -159,10 +159,8 @@ static av_noinline void FUNC(hl_decode_mb)(H264Context *h)
                                uvlinesize, 1, 0, SIMPLE, PIXEL_SHIFT);
 
             if (SIMPLE || !CONFIG_GRAY || !(s->flags & CODEC_FLAG_GRAY)) {
-                if (CHROMA) {
                 h->hpc.pred8x8[h->chroma_pred_mode](dest_cb, uvlinesize);
                 h->hpc.pred8x8[h->chroma_pred_mode](dest_cr, uvlinesize);
-                }
             }
 
             hl_decode_mb_predict_luma(h, mb_type, is_h264, SIMPLE,