Commit 65af5e81 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '1b6f84a9'

* commit '1b6f84a9':
  h264_refs: Do not print check_opcodes() return value
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 124244ec 1b6f84a9
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment