diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 13:39:22 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-28 13:40:47 +0200 |
| commit | 65af5e815a7aa9a9443bb0a48875f366ae812b5c (patch) | |
| tree | 78418bae4b22fafa932fa7304e28e768c869ec7a /libavcodec/h264_refs.c | |
| parent | 124244ec48c1b733b7ad40eee67ae1a205f0162b (diff) | |
| parent | 1b6f84a98665a15130e969fd6b460a05d50090c1 (diff) | |
| download | ffmpeg-65af5e815a7aa9a9443bb0a48875f366ae812b5c.tar.gz | |
Merge commit '1b6f84a98665a15130e969fd6b460a05d50090c1'
* commit '1b6f84a98665a15130e969fd6b460a05d50090c1':
h264_refs: Do not print check_opcodes() return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264_refs.c')
| -rw-r--r-- | libavcodec/h264_refs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 4b69a90dd3..ac87715473 100644 --- 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); |