Merge commit '1b6f84a98665a15130e969fd6b460a05d50090c1'

* commit '1b6f84a98665a15130e969fd6b460a05d50090c1': h264_refs: Do not print check_opcodes() return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago · 65af5e815a
parent 124244ec48 1b6f84a986
commit 65af5e815a
1 changed files with 1 additions and 1 deletions
--- 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);