[FFmpeg-cvslog] avcodec/h264: reduce noisiness of "mmco: unref short failure"
Michael Niedermayer
git at videolan.org
Sat Oct 26 01:30:07 CEST 2013
ffmpeg | branch: release/0.11 | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 25 20:03:29 2013 +0200| [d49761b396435282f0c823cee7e51550f8f8f921] | committer: Carl Eugen Hoyos
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 at gmx.at>
(cherry picked from commit 08a89761964bdd0a023eff6d37a1131fb7e1d7a0)
Conflicts:
libavcodec/h264_refs.c
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d49761b396435282f0c823cee7e51550f8f8f921
---
libavcodec/h264_refs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index f39e69a..a12647d 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;
More information about the ffmpeg-cvslog
mailing list