Disable MPEG1/2 style timestamp calculation for H264 it still randomizes

the timestamps because delay is not known for the first few frames.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17674 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 9354b758862595bde213580c580b72cf76be235a..ec64eb92b2583dfaabbfa19ed558d733112d3dd6 100644 (file)
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -859,7 +859,8 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
 
 //    av_log(NULL, AV_LOG_DEBUG, "IN delayed:%d pts:%"PRId64", dts:%"PRId64" cur_dts:%"PRId64" st:%d pc:%p\n", presentation_delayed, pkt->pts, pkt->dts, st->cur_dts, pkt->stream_index, pc);
     /* interpolate PTS and DTS if they are not present */
-    if(delay==0 || (delay==1 && pc)){
+    //We skip H264 currently because delay and has_b_frames are not reliably set
+    if((delay==0 || (delay==1 && pc)) && st->codec->codec_id != CODEC_ID_H264){
         if (presentation_delayed) {
             /* DTS = decompression timestamp */
             /* PTS = presentation timestamp */
@@ -907,7 +908,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
             FFSWAP(int64_t, st->pts_buffer[i], st->pts_buffer[i+1]);
         if(pkt->dts == AV_NOPTS_VALUE)
             pkt->dts= st->pts_buffer[0];
-        if(delay>1){
+        if(st->codec->codec_id == CODEC_ID_H264){ //we skiped it above so we try here
             update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts); // this should happen on the first packet
         }
         if(pkt->dts > st->cur_dts)