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 01:27:53 +0200 |
| commit | 558c1f35fa09e0f7f67eb27d7c0ff3dd05ba84cd (patch) | |
| tree | af5fb49a7c5276fd7d814261da2837201d229c5f /libavcodec | |
| parent | 8096691a681bdba8db5fcb6a1e843f73ef5d5cbe (diff) | |
| download | ffmpeg-558c1f35fa09e0f7f67eb27d7c0ff3dd05ba84cd.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)
Conflicts:
libavcodec/h264_refs.c
Diffstat (limited to 'libavcodec')
| -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 b872759724..0ccbe62bcb 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -516,7 +516,7 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){ if(!pic){ 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->s.avctx, AV_LOG_ERROR, "mmco: unref short failure\n"); + av_log(h->s.avctx, h->short_ref_count ? AV_LOG_ERROR : AV_LOG_DEBUG, "mmco: unref short failure\n"); err = AVERROR_INVALIDDATA; } continue; |