summaryrefslogtreecommitdiff
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-07-25 14:52:58 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-07-25 14:52:58 +0000
commit37dcf83077cd995c2b51721e317ce0a9aa83ba3d (patch)
treec63ffe8a682aaf456b816cfbfc5930750cc8188c /libavcodec/h264.c
parentd9e32422138d96329d9565a31961497f59b6826e (diff)
Do not scare the user with error messages when everything is ok.
Originally committed as revision 14396 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 4697d55b0d..861e7c15e7 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;
}