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:26:00 +0200 |
| commit | d49761b396435282f0c823cee7e51550f8f8f921 (patch) | |
| tree | b23b7c53299d6383fa0011e7936b5fb791483c30 | |
| parent | 43af9624fe11b89c02fa67e6993ba7b5f68d35c1 (diff) | |
| download | ffmpeg-d49761b396435282f0c823cee7e51550f8f8f921.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 f39e69a271..a12647db11 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -519,7 +519,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; |