From f781f748b91aebf96c3e4b2fdaa998e736554ff4 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 18 Oct 2008 22:41:21 +0000 Subject: Move code setting delay and presentation_delayed a little up so that the variables are available sooner. Originally committed as revision 15640 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/utils.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'libavformat/utils.c') diff --git a/libavformat/utils.c b/libavformat/utils.c index 1f1a174a04..f4377fed3d 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -824,6 +824,15 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, int num, den, presentation_delayed, delay, i; int64_t offset; + /* do we have a video B-frame ? */ + delay= st->codec->has_b_frames; + presentation_delayed = 0; + /* XXX: need has_b_frame, but cannot get it if the codec is + not initialized */ + if (delay && + pc && pc->pict_type != FF_B_TYPE) + presentation_delayed = 1; + if(pkt->pts != AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE && pkt->dts > pkt->pts && st->pts_wrap_bits<63 /*&& pkt->dts-(1LL<pts_wrap_bits) < pkt->pts*/){ pkt->dts -= 1LL<pts_wrap_bits; @@ -850,14 +859,6 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, pkt->dts += offset; } - /* do we have a video B-frame ? */ - delay= st->codec->has_b_frames; - presentation_delayed = 0; - /* XXX: need has_b_frame, but cannot get it if the codec is - not initialized */ - if (delay && - pc && pc->pict_type != FF_B_TYPE) - presentation_delayed = 1; /* This may be redundant, but it should not hurt. */ if(pkt->dts != AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE && pkt->pts > pkt->dts) presentation_delayed = 1; -- cgit v1.2.3