From fb19e1443bc45e192545d3485ddb9c76e7d77855 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 19 Jul 2008 16:16:00 +0000 Subject: [PATCH] Take the brain amputated spec literally if the user asks for it (-strict 1). That is, add 16 frames delay, cache trashing and av desync. fixes at least the following reference bitstreams: CABA3_Sony_C.jsv CACQP3_Sony_D.jsv CAMANL1_TOSHIBA_B.264 CANL3_Sony_C.jsv CVBS3_Sony_C.jsv CVMANL1_TOSHIBA_B.264 Originally committed as revision 14308 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 2e7b1cddaf..4a02ae6795 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -7836,6 +7836,12 @@ static int decode_frame(AVCodecContext *avctx, s->low_delay = 0; } + if( s->avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT + && !h->sps.bitstream_restriction_flag){ + s->avctx->has_b_frames= MAX_DELAYED_PIC_COUNT; + s->low_delay= 0; + } + pics = 0; while(h->delayed_pic[pics]) pics++;