Author: gkovacs
Date: Tue Aug 11 11:53:01 2009
New Revision: 5033
Log:
removed commented-out code that was accidentally committed
Modified:
concat/libavformat/concatgen.c
concat/libavformat/playlist.c
Modified: concat/libavformat/concatgen.c
==============================================================================
--- concat/libavformat/concatgen.c Tue Aug 11 11:51:07 2009 (r5032)
+++ concat/libavformat/concatgen.c Tue Aug 11 11:53:01 2009 (r5033)
@@ -40,20 +40,16 @@ int ff_concatgen_read_packet(AVFormatCon
char have_switched_streams = 0;
ctx = s->priv_data;
stream_index = 0;
-// pkt = NULL;
for (;;) {
ic = ctx->icl[ctx->pe_curidx];
-// ff_playlist_set_streams(s);
ret = ic->iformat->read_packet(ic, pkt);
-// ff_playlist_set_streams(s);
s->cur_st = ic->cur_st;
if (ret >= 0) {
if (pkt) {
pkt->stream = ic->streams[pkt->stream_index];
- stream_index = pkt->stream_index;
- pkt->index_offset = ff_playlist_streams_offset_from_playidx(ctx,
ctx->pe_curidx);
- pkt->stream_index += pkt->index_offset;
-// ff_playlist_set_streams(s);
+ stream_index = pkt->stream_index;
+ pkt->index_offset =
ff_playlist_streams_offset_from_playidx(ctx, ctx->pe_curidx);
+ pkt->stream_index += pkt->index_offset;
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,
Modified: concat/libavformat/playlist.c
==============================================================================
--- concat/libavformat/playlist.c Tue Aug 11 11:51:07 2009 (r5032)
+++ concat/libavformat/playlist.c Tue Aug 11 11:53:01 2009 (r5033)
@@ -231,7 +231,6 @@ int ff_playlist_localstidx_from_streamid
int ff_playlist_streams_offset_from_playidx(PlaylistContext *ctx, int playidx)
{
-// return 0;
int i, total;
i = total = 0;
while (playidx > i)
_______________________________________________
FFmpeg-soc mailing list
[email protected]
https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-soc
