[FFmpeg-soc] [soc]: r5236 - in concat/libavformat: avplaylist.c avplaylist.h

[gkovacs]

Author: gkovacs
Date: Mon Aug 24 07:43:44 2009
New Revision: 5236

Log:
remove unused convenience function av_playlist_from_encodedstring

Modified:
   concat/libavformat/avplaylist.c
   concat/libavformat/avplaylist.h

Modified: concat/libavformat/avplaylist.c
==============================================================================
--- concat/libavformat/avplaylist.c	Mon Aug 24 07:38:57 2009	(r5235)
+++ concat/libavformat/avplaylist.c	Mon Aug 24 07:43:44 2009	(r5236)
@@ -165,7 +165,7 @@ AVPlaylistContext *av_playlist_from_file
     AVPlaylistContext *ctx;
     ctx = av_mallocz(sizeof(*ctx));
     if (!ctx) {
-        av_log(NULL, AV_LOG_ERROR, "av_mallocz error in av_playlist_from_encodedstring\n");
+        av_log(NULL, AV_LOG_ERROR, "av_mallocz error in av_playlist_from_filelist\n");
         return NULL;
     }
     for (i = 0; i < len; ++i)
@@ -173,23 +173,6 @@ AVPlaylistContext *av_playlist_from_file
     return ctx;
 }
 
-AVPlaylistContext *av_playlist_from_encodedstring(const char *s, const char sep)
-{
-    AVPlaylistContext *ctx;
-    char **flist;
-    int i, len;
-    av_playlist_split_encodedstring(s, sep, &flist, &len);
-    if (len <= 1) {
-        for (i = 0; i < len; ++i)
-            av_free(flist[i]);
-        av_free(flist);
-        return NULL;
-    }
-    ctx = av_playlist_from_filelist(flist, len);
-    av_free(flist);
-    return ctx;
-}
-
 void av_playlist_add_path(AVPlaylistContext *ctx, const char *itempath)
 {
     ctx->flist = av_realloc(ctx->flist, sizeof(*(ctx->flist)) * (++ctx->pelist_size+1));

Modified: concat/libavformat/avplaylist.h
==============================================================================
--- concat/libavformat/avplaylist.h	Mon Aug 24 07:38:57 2009	(r5235)
+++ concat/libavformat/avplaylist.h	Mon Aug 24 07:43:44 2009	(r5236)
@@ -105,13 +105,6 @@ void av_playlist_split_encodedstring(con
  */
 AVPlaylistContext *av_playlist_from_filelist(const char **flist, int len);
 
-/** @brief Allocates and returns a AVPlaylistContext with playlist elements specified by a character-delimited string.
- *  @param s The input character-delimited string ("one,two,three").
- *  @param sep The delimiter character (',').
- *  @return Returns the allocated AVPlaylistContext.
- */
-AVPlaylistContext *av_playlist_from_encodedstring(const char *s, const char sep);
-
 /** @brief Creates and adds AVFormatContext for item located at specified path to a AVPlaylistContext.
  *  @param ctx Pre-allocated AVPlaylistContext to add elements to.
  *  @param itempath Absolute path to item for which to add a playlist element.