diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-25 20:03:29 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-10-26 00:52:34 +0200 |
| commit | 782331be1eb23717a2c7633f8e364f0e833275e4 (patch) | |
| tree | ea2dbd765db1b4b6eaf11adcd7732f1ecb09256a | |
| parent | 94c7ee4d9e03445c9109bea328a4e01b0bd56ad6 (diff) | |
| download | ffmpeg-782331be1eb23717a2c7633f8e364f0e833275e4.tar.gz | |
avcodec/h264: reduce noisiness of "mmco: unref short failure"
Do not consider it an error if we have no frames and should discard one.
This condition can easily happen when decoding is started from an I frame
Fixes Ticket2811
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 08a89761964bdd0a023eff6d37a1131fb7e1d7a0)
| -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 1b61010549..954af21a63 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -583,7 +583,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count) if (mmco[i].opcode != MMCO_SHORT2LONG || !h->long_ref[mmco[i].long_arg] || h->long_ref[mmco[i].long_arg]->frame_num != frame_num) { - av_log(h->avctx, AV_LOG_ERROR, "mmco: unref short failure\n"); + av_log(h->avctx, h->short_ref_count ? AV_LOG_ERROR : AV_LOG_DEBUG, "mmco: unref short failure\n"); err = AVERROR_INVALIDDATA; } continue; |