[FFmpeg-soc] [soc]: r5185 - in concat/libavformat: playlist.c playlist.h utils.c.diff

[gkovacs]

Author: gkovacs
Date: Thu Aug 20 10:56:59 2009
New Revision: 5185

Log:
removed ff_playlist_set_context

Modified:
   concat/libavformat/playlist.c
   concat/libavformat/playlist.h
   concat/libavformat/utils.c.diff

Modified: concat/libavformat/playlist.c
==============================================================================
--- concat/libavformat/playlist.c	Thu Aug 20 10:56:54 2009	(r5184)
+++ concat/libavformat/playlist.c	Thu Aug 20 10:56:59 2009	(r5185)
@@ -95,12 +95,6 @@ PlaylistContext *ff_playlist_get_context
         return NULL;
 }
 
-void ff_playlist_set_context(AVFormatContext *ic, PlaylistContext *ctx)
-{
-    if (ic && ctx)
-        ic->priv_data = ctx;
-}
-
 void ff_playlist_split_encodedstring(const char *s,
                                      const char sep,
                                      char ***flist_ptr,

Modified: concat/libavformat/playlist.h
==============================================================================
--- concat/libavformat/playlist.h	Thu Aug 20 10:56:54 2009	(r5184)
+++ concat/libavformat/playlist.h	Thu Aug 20 10:56:59 2009	(r5185)
@@ -77,13 +77,6 @@ void ff_playlist_set_streams(AVFormatCon
  */
 PlaylistContext* ff_playlist_get_context(AVFormatContext *ic);
 
-/** @fn void ff_playlist_set_context(AVFormatContext *ic, PlaylistContext *ctx)
- *  @brief Sets PlaylistContext for a concat-type demuxer.
- *  @param ic AVFormatContext of the concat-type demuxer.
- *  @param ctx PlaylistContext that will be set in the concat-type demuxer.
- */
-void ff_playlist_set_context(AVFormatContext *ic, PlaylistContext *ctx);
-
 /** @fn void ff_playlist_relative_paths(char **flist, int len, const char *workingdir)
  *  @brief Converts a list of mixed relative or absolute paths into all absolute paths.
  *  @param flist List of null-terminated strings of relative or absolute paths.

Modified: concat/libavformat/utils.c.diff
==============================================================================
--- concat/libavformat/utils.c.diff	Thu Aug 20 10:56:54 2009	(r5184)
+++ concat/libavformat/utils.c.diff	Thu Aug 20 10:56:59 2009	(r5185)
@@ -1,5 +1,5 @@
 diff --git a/libavformat/utils.c b/libavformat/utils.c
-index b9f6c00..3b652a0 100644
+index b9f6c00..86a710c 100644
 --- a/libavformat/utils.c
 +++ b/libavformat/utils.c
 @@ -27,6 +27,7 @@
@@ -37,7 +37,7 @@ index b9f6c00..3b652a0 100644
 +        av_log(ic, AV_LOG_DEBUG, "Generating playlist from %s\n", filename);
 +        av_strlcpy(ic->filename, filename, sizeof(ic->filename));
 +        ic->iformat = ff_concat_alloc_demuxer();
-+        ff_playlist_set_context(ic, playlist_ctx);
++        ic->priv_data = playlist_ctx;
 +        ff_playlist_populate_context(playlist_ctx, playlist_ctx->pe_curidx);
 +        ff_playlist_set_streams(ic);
 +        return 0;