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:22:39 +0200 |
| commit | 946815aa097470127d3d97534cf6a29f7310982c (patch) | |
| tree | aa54a27fa2c2e73ada7c5f82a9083f6ab665329f | |
| parent | 89b5f5f494a2387541de8960839c2539a73a31fa (diff) | |
| download | ffmpeg-946815aa097470127d3d97534cf6a29f7310982c.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
| -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 37372ef483..7c73cd9eaf 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -553,7 +553,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; |