[FFmpeg-soc] [soc]: r4894 - concat/libavformat/concatgen.c

[gkovacs]

Author: gkovacs
Date: Sat Aug  1 20:48:10 2009
New Revision: 4894

Log:
don't modify either dts or pts when using b-frames, fixes issues with h264

Modified:
   concat/libavformat/concatgen.c

Modified: concat/libavformat/concatgen.c
==============================================================================
--- concat/libavformat/concatgen.c	Sat Aug  1 06:52:20 2009	(r4893)
+++ concat/libavformat/concatgen.c	Sat Aug  1 20:48:10 2009	(r4894)
@@ -48,12 +48,12 @@ int ff_concatgen_read_packet(AVFormatCon
         }
         if (ret >= 0) {
             if (pkt) {
-                // TODO changing either dts or pts leads to timing issues on h264
-                pkt->dts += av_rescale_q(ff_playlist_time_offset(ctx->durations, ctx->pe_curidx),
-                                         AV_TIME_BASE_Q,
-                                         ic->streams[stream_index]->time_base);
-                if (!ic->streams[pkt->stream_index]->codec->has_b_frames)
+                if (!ic->streams[pkt->stream_index]->codec->has_b_frames) {
+                    pkt->dts += av_rescale_q(ff_playlist_time_offset(ctx->durations, ctx->pe_curidx),
+                                             AV_TIME_BASE_Q,
+                                             ic->streams[stream_index]->time_base);
                     pkt->pts = pkt->dts + 1;
+                }
             }
             break;
         } else {