Author: gkovacs Date: Sat Jul 4 23:24:40 2009 New Revision: 4602 Log: added ff_playlist prefix to functions Modified: concat/libavformat/concatgen.c concat/libavformat/m3u.c concat/libavformat/playlist.c concat/libavformat/playlist.h Modified: concat/libavformat/concatgen.c ============================================================================== --- concat/libavformat/concatgen.c Sat Jul 4 23:19:36 2009 (r4601) +++ concat/libavformat/concatgen.c Sat Jul 4 23:24:40 2009 (r4602) @@ -57,7 +57,7 @@ int concatgen_read_packet(AVFormatContex // playld->dts_offset += playld->dts_prevpacket; printf("switching streams\n"); for (i = 0; i < ic->nb_streams && i < ctx->time_offsets_size; ++i) { - ctx->time_offsets[i] += ff_get_duration(ic, i); + ctx->time_offsets[i] += ff_playlist_get_duration(ic, i); } ++ctx->pe_curidxs[stream_index]; // pkt->destruct(pkt); @@ -82,7 +82,7 @@ int concatgen_read_seek(AVFormatContext AVFormatContext *ic; ctx = s->priv_data; ic = ctx->pelist[ctx->pe_curidxs[0]]->ic; - ic->iformat->read_seek(ic, stream_index, pts, flags); + return ic->iformat->read_seek(ic, stream_index, pts, flags); } int concatgen_read_timestamp(AVFormatContext *s, @@ -90,7 +90,6 @@ int concatgen_read_timestamp(AVFormatCon int64_t *pos, int64_t pos_limit) { - printf("m3u_read_timestamp called\n"); PlaylistContext *ctx; AVFormatContext *ic; ctx = s->priv_data; @@ -102,7 +101,6 @@ int concatgen_read_timestamp(AVFormatCon int concatgen_read_close(AVFormatContext *s) { - printf("m3u_read_close called\n"); PlaylistContext *ctx; AVFormatContext *ic; ctx = s->priv_data; @@ -114,7 +112,6 @@ int concatgen_read_close(AVFormatContext int concatgen_read_play(AVFormatContext *s) { - printf("m3u_read_play called\n"); PlaylistContext *ctx; AVFormatContext *ic; ctx = s->priv_data; @@ -124,7 +121,6 @@ int concatgen_read_play(AVFormatContext int concatgen_read_pause(AVFormatContext *s) { - printf("m3u_read_pause called\n"); PlaylistContext *ctx; AVFormatContext *ic; ctx = s->priv_data; Modified: concat/libavformat/m3u.c ============================================================================== --- concat/libavformat/m3u.c Sat Jul 4 23:19:36 2009 (r4601) +++ concat/libavformat/m3u.c Sat Jul 4 23:24:40 2009 (r4602) @@ -82,7 +82,7 @@ static int m3u_read_header(AVFormatConte AVFormatParameters *ap) { int i; - PlaylistContext *ctx = ff_make_playlistc(s->filename); + PlaylistContext *ctx = ff_playlist_make_context(s->filename); m3u_list_files(s->pb, &(ctx->flist), &(ctx->pelist_size), Modified: concat/libavformat/playlist.c ============================================================================== --- concat/libavformat/playlist.c Sat Jul 4 23:19:36 2009 (r4601) +++ concat/libavformat/playlist.c Sat Jul 4 23:24:40 2009 (r4602) @@ -45,7 +45,7 @@ int ff_alloc_playelem(unsigned char *fil return 0; } -PlayElem* ff_make_playelem(char *filename) +PlayElem* ff_playlist_make_playelem(char *filename) { int err; PlayElem *pe = av_malloc(sizeof(*pe)); @@ -77,7 +77,7 @@ PlayElem* ff_make_playelem(char *filenam return pe; } -PlaylistContext* ff_make_playlistc(char *filename) +PlaylistContext* ff_playlist_make_context(char *filename) { int i; PlaylistContext *ctx = av_malloc(sizeof(*ctx)); @@ -180,7 +180,7 @@ int ff_playlist_populate_context(Playlis AVFormatContext *ic; AVFormatParameters *nap; printf("playlist_populate_context called\n"); - ctx->pelist[ctx->pe_curidxs[stream_index]] = ff_make_playelem(ctx->flist[ctx->pe_curidxs[stream_index]]); + ctx->pelist[ctx->pe_curidxs[stream_index]] = ff_playlist_make_playelem(ctx->flist[ctx->pe_curidxs[stream_index]]); ic = ctx->pelist[ctx->pe_curidxs[stream_index]]->ic; nap = ctx->pelist[ctx->pe_curidxs[stream_index]]->ap; ic->iformat->read_header(ic, 0); @@ -259,7 +259,7 @@ int64_t ff_conv_base_time(AVFormatContex } // returns duration in seconds * AV_TIME_BASE -int64_t ff_get_duration(AVFormatContext *ic, int stream_index) +int64_t ff_playlist_get_duration(AVFormatContext *ic, int stream_index) { // TODO storing previous packet pts/dts is ugly hack // ic->stream[]->cur_dts correct Modified: concat/libavformat/playlist.h ============================================================================== --- concat/libavformat/playlist.h Sat Jul 4 23:19:36 2009 (r4601) +++ concat/libavformat/playlist.h Sat Jul 4 23:24:40 2009 (r4602) @@ -52,9 +52,9 @@ typedef struct PlaylistContext { int time_offsets_size; } PlaylistContext; -PlayElem* ff_make_playelem(char *filename); +PlayElem* ff_playlist_make_playelem(char *filename); -PlaylistContext* ff_make_playlistc(char *filename); +PlaylistContext* ff_playlist_make_context(char *filename); int ff_playlist_populate_context(PlaylistContext *playlc, AVFormatContext *s, int stream_index); @@ -68,6 +68,6 @@ int64_t ff_conv_stream_time(AVFormatCont int64_t ff_conv_base_time(AVFormatContext *ic, int stream_index, int64_t stream_duration); -int64_t ff_get_duration(AVFormatContext *ic, int stream_index); +int64_t ff_playlist_get_duration(AVFormatContext *ic, int stream_index); #endif /* _PLAYLIST_H */