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

[gkovacs]

Author: gkovacs
Date: Thu Aug 13 21:53:04 2009
New Revision: 5085

Log:
don't assume pkt->stream_index is always in local stream indicies after read_packet

Modified:
   concat/libavformat/concatgen.c

Modified: concat/libavformat/concatgen.c
==============================================================================
--- concat/libavformat/concatgen.c	Thu Aug 13 21:42:49 2009	(r5084)
+++ concat/libavformat/concatgen.c	Thu Aug 13 21:53:04 2009	(r5085)
@@ -52,8 +52,8 @@ int ff_concatgen_read_packet(AVFormatCon
         }
         if (ret >= 0) {
             if (pkt) {
-                stream_index = pkt->stream_index;
-                pkt->stream_index += ff_playlist_streams_offset_from_playidx(ctx, ctx->pe_curidx);
+                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) {
                     pkt->dts += av_rescale_q(ff_playlist_time_offset(ctx->durations, ctx->pe_curidx),
                                              AV_TIME_BASE_Q,