[FFmpeg-soc] [soc]: r5298 - in concat/libavformat: avplaylist.c avplaylist.h m3u.c pls.c utils.c.diff xspf.c

[gkovacs]

Author: gkovacs
Date: Wed Aug 26 09:47:47 2009
New Revision: 5298

Log:
rename add_path and insert_path to add_item and insert_item since paths are the only items available

Modified:
   concat/libavformat/avplaylist.c
   concat/libavformat/avplaylist.h
   concat/libavformat/m3u.c
   concat/libavformat/pls.c
   concat/libavformat/utils.c.diff
   concat/libavformat/xspf.c

Modified: concat/libavformat/avplaylist.c
==============================================================================
--- concat/libavformat/avplaylist.c	Wed Aug 26 09:42:59 2009	(r5297)
+++ concat/libavformat/avplaylist.c	Wed Aug 26 09:47:47 2009	(r5298)
@@ -133,7 +133,7 @@ int av_playlist_insert_path(AVPlaylistCo
     return 0;
 }
 
-int av_playlist_add_path(AVPlaylistContext *ctx, const char *itempath)
+int av_playlist_add_item(AVPlaylistContext *ctx, const char *itempath)
 {
     return av_playlist_insert_path(ctx, itempath, ctx->pelist_size);
 }

Modified: concat/libavformat/avplaylist.h
==============================================================================
--- concat/libavformat/avplaylist.h	Wed Aug 26 09:42:59 2009	(r5297)
+++ concat/libavformat/avplaylist.h	Wed Aug 26 09:47:47 2009	(r5298)
@@ -75,7 +75,7 @@ int av_playlist_split_encodedstring(cons
  *  @param itempath Absolute path to item for which to add a playlist element.
  *  @return Returns 0 upon success, or negative upon failure.
  */
-int av_playlist_add_path(AVPlaylistContext *ctx, const char *itempath);
+int av_playlist_add_item(AVPlaylistContext *ctx, const char *itempath);
 
 /** @brief Creates and adds AVFormatContext for item located at specified path to a AVPlaylistContext
  *  at specified index. Existing items will be shifted up in the list.
@@ -84,6 +84,6 @@ int av_playlist_add_path(AVPlaylistConte
  *  @param pos Index which the newly inserted item will occupy.
  *  @return Returns 0 upon success, or negative upon failure.
  */
-int av_playlist_insert_path(AVPlaylistContext *ctx, const char *itempath, int pos);
+int av_playlist_insert_item(AVPlaylistContext *ctx, const char *itempath, int pos);
 
 #endif /* AVFORMAT_AVPLAYLIST_H */

Modified: concat/libavformat/m3u.c
==============================================================================
--- concat/libavformat/m3u.c	Wed Aug 26 09:42:59 2009	(r5297)
+++ concat/libavformat/m3u.c	Wed Aug 26 09:47:47 2009	(r5298)
@@ -99,7 +99,7 @@ static int m3u_read_header(AVFormatConte
         return AVERROR_NOMEM;
     }
     for (i = 0; i < flist_len; ++i)
-        av_playlist_add_path(ctx, flist[i]);
+        av_playlist_add_item(ctx, flist[i]);
     av_free(flist);
     s->priv_data = ctx;
     ctx->master_formatcontext = s;

Modified: concat/libavformat/pls.c
==============================================================================
--- concat/libavformat/pls.c	Wed Aug 26 09:42:59 2009	(r5297)
+++ concat/libavformat/pls.c	Wed Aug 26 09:47:47 2009	(r5298)
@@ -118,7 +118,7 @@ static int pls_read_header(AVFormatConte
         return AVERROR_NOMEM;
     }
     for (i = 0; i < flist_len; ++i)
-        av_playlist_add_path(ctx, flist[i]);
+        av_playlist_add_item(ctx, flist[i]);
     av_free(flist);
     s->priv_data = ctx;
     ctx->master_formatcontext = s;

Modified: concat/libavformat/utils.c.diff
==============================================================================
--- concat/libavformat/utils.c.diff	Wed Aug 26 09:42:59 2009	(r5297)
+++ concat/libavformat/utils.c.diff	Wed Aug 26 09:47:47 2009	(r5298)
@@ -1,5 +1,5 @@
 diff --git a/libavformat/utils.c b/libavformat/utils.c
-index 4cec286..97c17f0 100644
+index 4cec286..e960580 100644
 --- a/libavformat/utils.c
 +++ b/libavformat/utils.c
 @@ -27,6 +27,8 @@
@@ -33,7 +33,7 @@ index 4cec286..97c17f0 100644
 +            if (playlist_ctx) {
 +                av_log(ic, AV_LOG_DEBUG, "Generating playlist from %s\n", filename);
 +                for (i = 0; i < flist_len; ++i)
-+                    av_playlist_add_path(playlist_ctx, flist[i]);
++                    av_playlist_add_item(playlist_ctx, flist[i]);
 +                av_strlcpy(ic->filename, filename, sizeof(ic->filename));
 +                ff_playlist_populate_context(playlist_ctx, playlist_ctx->pe_curidx);
 +                ff_playlist_set_streams(playlist_ctx);

Modified: concat/libavformat/xspf.c
==============================================================================
--- concat/libavformat/xspf.c	Wed Aug 26 09:42:59 2009	(r5297)
+++ concat/libavformat/xspf.c	Wed Aug 26 09:47:47 2009	(r5298)
@@ -141,7 +141,7 @@ static int xspf_read_header(AVFormatCont
         return AVERROR_NOMEM;
     }
     for (i = 0; i < flist_len; ++i)
-        av_playlist_add_path(ctx, flist[i]);
+        av_playlist_add_item(ctx, flist[i]);
     av_free(flist);
     s->priv_data = ctx;
     ctx->master_formatcontext = s;