From: Michael Niedermayer <michaelni@gmx.at>
Date: Fri, 25 Jul 2008 14:52:58 +0000 (+0000)
Subject: Do not scare the user with error messages when everything is ok.
X-Git-Tag: v0.5~3501
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=37dcf83077cd995c2b51721e317ce0a9aa83ba3d;p=platform%2Fupstream%2Flibav.git

Do not scare the user with error messages when everything is ok.

Originally committed as revision 14396 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 4697d55..861e7c1 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3460,6 +3460,8 @@ static int execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count){
             frame_num = pic_num_extract(h, mmco[i].short_pic_num, &structure);
             pic = find_short(h, frame_num, &j);
             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");
                 continue;
             }