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

[gkovacs]

Author: gkovacs
Date: Thu Aug 13 21:57:30 2009
New Revision: 5086

Log:
mpeg1video reports b_frames but requires dts and pts to be offset

Modified:
   concat/libavformat/concatgen.c

Modified: concat/libavformat/concatgen.c
==============================================================================
--- concat/libavformat/concatgen.c	Thu Aug 13 21:53:04 2009	(r5085)
+++ concat/libavformat/concatgen.c	Thu Aug 13 21:57:30 2009	(r5086)
@@ -54,7 +54,8 @@ int ff_concatgen_read_packet(AVFormatCon
             if (pkt) {
                 stream_index = ff_playlist_localstidx_from_streamidx(ctx, pkt->stream_index);
                 pkt->stream_index = stream_index + ff_playlist_streams_offset_from_playidx(ctx, ctx->pe_curidx);
-                if (!ic->streams[stream_index]->codec->has_b_frames) {
+                if (!ic->streams[stream_index]->codec->has_b_frames ||
+                    ic->streams[stream_index]->codec->codec->id == CODEC_ID_MPEG1VIDEO) {
                     pkt->dts += av_rescale_q(ff_playlist_time_offset(ctx->durations, ctx->pe_curidx),
                                              AV_TIME_BASE_Q,
                                              ic->streams[stream_index]->time_base);