[FFmpeg-soc] [soc]: r5233 - concat/libavformat/avplaylist.c
gkovacs
subversion at mplayerhq.hu
Mon Aug 24 07:31:01 CEST 2009
Author: gkovacs
Date: Mon Aug 24 07:31:01 2009
New Revision: 5233
Log:
set read_timestamp to NULL when child demuxer doesn't implement the function
Modified:
concat/libavformat/avplaylist.c
Modified: concat/libavformat/avplaylist.c
==============================================================================
--- concat/libavformat/avplaylist.c Mon Aug 24 07:24:13 2009 (r5232)
+++ concat/libavformat/avplaylist.c Mon Aug 24 07:31:01 2009 (r5233)
@@ -91,6 +91,10 @@ void av_playlist_set_streams(AVFormatCon
s->nb_streams = ic->nb_streams + offset;
s->packet_buffer = ic->packet_buffer;
s->packet_buffer_end = ic->packet_buffer_end;
+ if (ic->iformat->read_timestamp)
+ s->iformat->read_timestamp = ff_concatgen_read_timestamp;
+ else
+ s->iformat->read_timestamp = NULL;
}
AVPlaylistContext *av_playlist_get_context(AVFormatContext *ic)
More information about the FFmpeg-soc
mailing list