[FFmpeg-soc] [soc]: r4639 - in concat: ffmpeg.c.diff libavformat/m3u.c libavformat/playlist.c libavformat/playlist.h libavformat/pls.c libavformat/xspf.c

[gkovacs]

Author: gkovacs
Date: Mon Jul  6 20:51:57 2009
New Revision: 4639

Log:
renamed make_context to alloc_context, make_playelem to init_playelem

Modified:
   concat/ffmpeg.c.diff
   concat/libavformat/m3u.c
   concat/libavformat/playlist.c
   concat/libavformat/playlist.h
   concat/libavformat/pls.c
   concat/libavformat/xspf.c

Modified: concat/ffmpeg.c.diff
==============================================================================
--- concat/ffmpeg.c.diff	Mon Jul  6 20:33:01 2009	(r4638)
+++ concat/ffmpeg.c.diff	Mon Jul  6 20:51:57 2009	(r4639)
@@ -1,5 +1,5 @@
 diff --git a/ffmpeg.c b/ffmpeg.c
-index 22bfed8..5790959 100644
+index 22bfed8..d30a5ac 100644
 --- a/ffmpeg.c
 +++ b/ffmpeg.c
 @@ -70,6 +70,8 @@
@@ -102,7 +102,7 @@ index 22bfed8..5790959 100644
 +            ic = av_malloc(sizeof(*ic));
 +//            ic = avformat_alloc_context();
 +            printf("need to generate playlist ctx\n");
-+            playlist_ctx = ff_playlist_make_context(filename);
++            playlist_ctx = ff_playlist_alloc_context(filename);
 +            playlist_ctx->pelist_size = 1;
 +            playlist_ctx->pelist = av_malloc(playlist_ctx->pelist_size * sizeof(*(playlist_ctx->pelist)));
 +            memset(playlist_ctx->pelist, 0, playlist_ctx->pelist_size * sizeof(*(playlist_ctx->pelist)));

Modified: concat/libavformat/m3u.c
==============================================================================
--- concat/libavformat/m3u.c	Mon Jul  6 20:33:01 2009	(r4638)
+++ concat/libavformat/m3u.c	Mon Jul  6 20:51:57 2009	(r4639)
@@ -79,7 +79,7 @@ static int m3u_read_header(AVFormatConte
                            AVFormatParameters *ap)
 {
     int i;
-    PlaylistContext *ctx = ff_playlist_make_context(s->filename);
+    PlaylistContext *ctx = ff_playlist_alloc_context(s->filename);
     m3u_list_files(s->pb, ctx);
     s->priv_data = ctx;
     for (i = 0; i < ctx->pe_curidxs_size; ++i) {

Modified: concat/libavformat/playlist.c
==============================================================================
--- concat/libavformat/playlist.c	Mon Jul  6 20:33:01 2009	(r4638)
+++ concat/libavformat/playlist.c	Mon Jul  6 20:51:57 2009	(r4639)
@@ -24,7 +24,7 @@
 #include "internal.h"
 #include <cmdutils.h>
 
-void ff_playlist_make_playelem(PlayElem *pe)
+void ff_playlist_init_playelem(PlayElem *pe)
 {
     int err;
     pe->ic = av_malloc(sizeof(*(pe->ic)));
@@ -57,7 +57,7 @@ void ff_playlist_make_playelem(PlayElem 
     }
 }
 
-PlaylistContext* ff_playlist_make_context(const char *filename)
+PlaylistContext* ff_playlist_alloc_context(const char *filename)
 {
     int i;
     PlaylistContext *ctx = av_malloc(sizeof(*ctx));
@@ -160,7 +160,7 @@ int ff_playlist_populate_context(Playlis
     AVFormatParameters *nap;
     printf("playlist_populate_context called\n");
 //    ctx->pelist[ctx->pe_curidxs[stream_index]] = av_malloc(sizeof(*(ctx->pelist[ctx->pe_curidxs[stream_index]])));
-    ff_playlist_make_playelem(ctx->pelist[ctx->pe_curidxs[stream_index]]);
+    ff_playlist_init_playelem(ctx->pelist[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);

Modified: concat/libavformat/playlist.h
==============================================================================
--- concat/libavformat/playlist.h	Mon Jul  6 20:33:01 2009	(r4638)
+++ concat/libavformat/playlist.h	Mon Jul  6 20:51:57 2009	(r4639)
@@ -51,9 +51,9 @@ typedef struct PlaylistContext {
     int64_t *time_offsets; /**< Time offsets, in 10^-6 seconds, for each multimedia stream */
 } PlaylistContext;
 
-void ff_playlist_make_playelem(PlayElem* pe);
+void ff_playlist_init_playelem(PlayElem* pe);
 
-PlaylistContext* ff_playlist_make_context(const char *filename);
+PlaylistContext* ff_playlist_alloc_context(const char *filename);
 
 int ff_playlist_populate_context(PlaylistContext *playlc, AVFormatContext *s, int stream_index);
 

Modified: concat/libavformat/pls.c
==============================================================================
--- concat/libavformat/pls.c	Mon Jul  6 20:33:01 2009	(r4638)
+++ concat/libavformat/pls.c	Mon Jul  6 20:51:57 2009	(r4639)
@@ -68,7 +68,7 @@ static int pls_read_header(AVFormatConte
                            AVFormatParameters *ap)
 {
     int i;
-    PlaylistContext *ctx = ff_playlist_make_context(s->filename);
+    PlaylistContext *ctx = ff_playlist_alloc_context(s->filename);
     pls_list_files(s->pb, ctx);
     s->priv_data = ctx;
     for (i = 0; i < ctx->pe_curidxs_size; ++i) {

Modified: concat/libavformat/xspf.c
==============================================================================
--- concat/libavformat/xspf.c	Mon Jul  6 20:33:01 2009	(r4638)
+++ concat/libavformat/xspf.c	Mon Jul  6 20:51:57 2009	(r4639)
@@ -68,7 +68,7 @@ static int xspf_read_header(AVFormatCont
                             AVFormatParameters *ap)
 {
     int i;
-    PlaylistContext *ctx = ff_playlist_make_context(s->filename);
+    PlaylistContext *ctx = ff_playlist_alloc_context(s->filename);
     xspf_list_files(s->pb, ctx);
     s->priv_data = ctx;
     for (i = 0; i < ctx->pe_curidxs_size; ++i) {