Merge commit 'f5eecee865a731d2412fde2f73c29f8f8115c499'

[ffmpeg] / libavcodec / h264_refs.c

diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 4b69a90dd3849cae53b8e43d3e20a4b51cdd5546..ac8771547383ad406a321dc0cf635ae4e326133d 100644 (file)
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -815,7 +815,7 @@ int ff_h264_decode_ref_pic_marking(H264Context *h, GetBitContext *gb,
         h->mmco_index = mmco_index;
     } else if (!first_slice && mmco_index >= 0 &&
                (mmco_index != h->mmco_index ||
-                (i = check_opcodes(h->mmco, mmco_temp, mmco_index)))) {
+                check_opcodes(h->mmco, mmco_temp, mmco_index))) {
         av_log(h->avctx, AV_LOG_ERROR,
                "Inconsistent MMCO state between slices [%d, %d]\n",
                mmco_index, h->mmco_index);