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

[gkovacs]

Author: gkovacs
Date: Fri Jul 31 00:41:54 2009
New Revision: 4844

Log:
using AVFormat->duration rather than AVStream->duration

Modified:
   concat/libavformat/concatgen.c

Modified: concat/libavformat/concatgen.c
==============================================================================
--- concat/libavformat/concatgen.c	Thu Jul 30 23:28:01 2009	(r4843)
+++ concat/libavformat/concatgen.c	Fri Jul 31 00:41:54 2009	(r4844)
@@ -63,7 +63,7 @@ int ff_concatgen_read_packet(AVFormatCon
             // TODO switch from AVERROR_EOF to AVERROR_EOS
             // -32 AVERROR_EOF for avi, -51 for ogg
                 av_log(ic, AV_LOG_DEBUG, "Switching stream %d to %d\n", stream_index, ctx->pe_curidx+1);
-                ctx->durations[ctx->pe_curidx] = av_rescale_q(ic->cur_st->duration, ic->cur_st->time_base, AV_TIME_BASE_Q);
+                ctx->durations[ctx->pe_curidx] = ic->duration;
                 ctx->pe_curidx = ff_playlist_stream_index_from_time(ctx, ff_playlist_time_offset(ctx->durations, ctx->pe_curidx));
                 ff_playlist_populate_context(ctx, ctx->pe_curidx);
                 ff_playlist_set_streams(s);