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

[gkovacs]

Author: gkovacs
Date: Mon Jul 13 00:28:52 2009
New Revision: 4687

Log:
declared concatgen functions as static

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

Modified: concat/ffmpeg.c.diff
==============================================================================
--- concat/ffmpeg.c.diff	Mon Jul 13 00:04:03 2009	(r4686)
+++ concat/ffmpeg.c.diff	Mon Jul 13 00:28:52 2009	(r4687)
@@ -1,5 +1,5 @@
 diff --git a/ffmpeg.c b/ffmpeg.c
-index 22bfed8..3ed3f4d 100644
+index 22bfed8..04e6e5c 100644
 --- a/ffmpeg.c
 +++ b/ffmpeg.c
 @@ -70,6 +70,8 @@
@@ -97,7 +97,7 @@ index 22bfed8..3ed3f4d 100644
 +            av_strlcpy(playlist_ctx->pelist[playlist_ctx->pelist_size-1]->filename, filename, filenamelen+1);
 +            av_strlcpy(ic->filename, filename, sizeof(ic->filename));
 +            ic->nb_streams = 2;
-+            ic->iformat = concat_alloc_demuxer();
++            ic->iformat = ff_concat_alloc_demuxer();
 +            ic->priv_data = playlist_ctx;
 +            for (i = 0; i < playlist_ctx->pe_curidxs_size; ++i) {
 +                ff_playlist_populate_context(playlist_ctx, ic, i);

Modified: concat/libavformat/concat.c
==============================================================================
--- concat/libavformat/concat.c	Mon Jul 13 00:04:03 2009	(r4686)
+++ concat/libavformat/concat.c	Mon Jul 13 00:28:52 2009	(r4687)
@@ -19,7 +19,19 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "concat.h"
+#include "playlist.h"
+
+static int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt);
+
+static int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags);
+
+static int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit);
+
+static int ff_concatgen_read_close(AVFormatContext *s);
+
+static int ff_concatgen_read_play(AVFormatContext *s);
+
+static int ff_concatgen_read_pause(AVFormatContext *s);
 
 /* The ffmpeg codecs we support, and the IDs they have in the file */
 static const AVCodecTag codec_concat_tags[] = {
@@ -39,7 +51,7 @@ static int concat_read_header(AVFormatCo
     return 0;
 }
 
-AVInputFormat* concat_alloc_demuxer(void)
+AVInputFormat* ff_concat_alloc_demuxer(void)
 {
     AVInputFormat *cdm = av_malloc(sizeof(*cdm));
     cdm->name           = "concat";

Modified: concat/libavformat/concat.h
==============================================================================
--- concat/libavformat/concat.h	Mon Jul 13 00:04:03 2009	(r4686)
+++ concat/libavformat/concat.h	Mon Jul 13 00:28:52 2009	(r4687)
@@ -24,7 +24,7 @@
 #ifndef AVFORMAT_CONCAT_H
 #define AVFORMAT_CONCAT_H
 
-AVInputFormat* concat_alloc_demuxer(void);
+
 
 #endif /* AVFORMAT_CONCAT_H */
 

Modified: concat/libavformat/m3u.c
==============================================================================
--- concat/libavformat/m3u.c	Mon Jul 13 00:04:03 2009	(r4686)
+++ concat/libavformat/m3u.c	Mon Jul 13 00:28:52 2009	(r4687)
@@ -21,6 +21,18 @@
 
 #include "playlist.h"
 
+static int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt);
+
+static int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags);
+
+static int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit);
+
+static int ff_concatgen_read_close(AVFormatContext *s);
+
+static int ff_concatgen_read_play(AVFormatContext *s);
+
+static int ff_concatgen_read_pause(AVFormatContext *s);
+
 /* The ffmpeg codecs we support, and the IDs they have in the file */
 static const AVCodecTag codec_m3u_tags[] = {
     { 0, 0 },

Modified: concat/libavformat/playlist.h
==============================================================================
--- concat/libavformat/playlist.h	Mon Jul 13 00:04:03 2009	(r4686)
+++ concat/libavformat/playlist.h	Mon Jul 13 00:28:52 2009	(r4687)
@@ -67,16 +67,6 @@ PlaylistContext* ff_playlist_get_context
 
 AVStream *ff_playlist_get_stream(PlaylistContext *ctx, int pe_idx, int stream_index);
 
-int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt);
-
-int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags);
-
-int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit);
-
-int ff_concatgen_read_close(AVFormatContext *s);
-
-int ff_concatgen_read_play(AVFormatContext *s);
-
-int ff_concatgen_read_pause(AVFormatContext *s);
+AVInputFormat* ff_concat_alloc_demuxer(void);
 
 #endif /* AVFORMAT_PLAYLIST_H */

Modified: concat/libavformat/pls.c
==============================================================================
--- concat/libavformat/pls.c	Mon Jul 13 00:04:03 2009	(r4686)
+++ concat/libavformat/pls.c	Mon Jul 13 00:28:52 2009	(r4687)
@@ -21,6 +21,18 @@
 
 #include "playlist.h"
 
+static int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt);
+
+static int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags);
+
+static int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit);
+
+static int ff_concatgen_read_close(AVFormatContext *s);
+
+static int ff_concatgen_read_play(AVFormatContext *s);
+
+static int ff_concatgen_read_pause(AVFormatContext *s);
+
 /* The ffmpeg codecs we support, and the IDs they have in the file */
 static const AVCodecTag codec_pls_tags[] = {
     { 0, 0 },

Modified: concat/libavformat/xspf.c
==============================================================================
--- concat/libavformat/xspf.c	Mon Jul 13 00:04:03 2009	(r4686)
+++ concat/libavformat/xspf.c	Mon Jul 13 00:28:52 2009	(r4687)
@@ -21,6 +21,18 @@
 
 #include "playlist.h"
 
+static int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt);
+
+static int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags);
+
+static int ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit);
+
+static int ff_concatgen_read_close(AVFormatContext *s);
+
+static int ff_concatgen_read_play(AVFormatContext *s);
+
+static int ff_concatgen_read_pause(AVFormatContext *s);
+
 /* The ffmpeg codecs we support, and the IDs they have in the file */
 static const AVCodecTag codec_xspf_tags[] = {
     { 0, 0 },