[FFmpeg-soc] [soc]: r4685 - in concat/libavformat: concatgen.h playlist.h

[gkovacs]

Author: gkovacs
Date: Sun Jul 12 23:54:20 2009
New Revision: 4685

Log:
merged concatgen.h into playlist.h

Deleted:
   concat/libavformat/concatgen.h
Modified:
   concat/libavformat/playlist.h

Modified: concat/libavformat/playlist.h
==============================================================================
--- concat/libavformat/playlist.h	Sun Jul 12 23:48:01 2009	(r4684)
+++ concat/libavformat/playlist.h	Sun Jul 12 23:54:20 2009	(r4685)
@@ -67,4 +67,16 @@ PlaylistContext* ff_playlist_get_context
 
 AVStream *ff_playlist_get_stream(PlaylistContext *ctx, int pe_idx, int stream_index);
 
+int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt);
+
+int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags);
+
+int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit);
+
+int ff_concatgen_read_close(AVFormatContext *s);
+
+int ff_concatgen_read_play(AVFormatContext *s);
+
+int ff_concatgen_read_pause(AVFormatContext *s);
+
 #endif /* AVFORMAT_PLAYLIST_H */