[FFmpeg-soc] [soc]: r4838 - in concat/libavformat: concat.c concatgen.h m3u.c pls.c xspf.c

[gkovacs]

Author: gkovacs
Date: Wed Jul 29 19:47:08 2009
New Revision: 4838

Log:
moved ff_concatgen declarations into concatgen.h

Added:
   concat/libavformat/concatgen.h
Modified:
   concat/libavformat/concat.c
   concat/libavformat/m3u.c
   concat/libavformat/pls.c
   concat/libavformat/xspf.c

Modified: concat/libavformat/concat.c
==============================================================================
--- concat/libavformat/concat.c	Wed Jul 29 16:41:37 2009	(r4837)
+++ concat/libavformat/concat.c	Wed Jul 29 19:47:08 2009	(r4838)
@@ -30,19 +30,7 @@
  *  the PlaylistContext in the AVFormatContext.
  */
 
-#include "playlist.h"
-
-extern int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt);
-
-extern int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags);
-
-extern int64_t ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit);
-
-extern int ff_concatgen_read_close(AVFormatContext *s);
-
-extern int ff_concatgen_read_play(AVFormatContext *s);
-
-extern int ff_concatgen_read_pause(AVFormatContext *s);
+#include "concatgen.h"
 
 // The FFmpeg codecs we support, and the IDs they have in the file
 static const AVCodecTag codec_concat_tags[] = {

Added: concat/libavformat/concatgen.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ concat/libavformat/concatgen.h	Wed Jul 29 19:47:08 2009	(r4838)
@@ -0,0 +1,40 @@
+/*
+ * Generic functions used by playlist/concatenation demuxers
+ * Copyright (c) 2009 Geza Kovacs
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef AVFORMAT_CONCATGEN_H
+#define AVFORMAT_CONCATGEN_H
+
+#include "playlist.h"
+
+int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt);
+
+int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags);
+
+int64_t 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);
+
+#endif /* AVFORMAT_CONCATGEN_H */
+

Modified: concat/libavformat/m3u.c
==============================================================================
--- concat/libavformat/m3u.c	Wed Jul 29 16:41:37 2009	(r4837)
+++ concat/libavformat/m3u.c	Wed Jul 29 19:47:08 2009	(r4838)
@@ -25,19 +25,7 @@
  *  @brief M3U playlist demuxer
  */
 
-#include "playlist.h"
-
-extern int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt);
-
-extern int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags);
-
-extern int64_t ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit);
-
-extern int ff_concatgen_read_close(AVFormatContext *s);
-
-extern int ff_concatgen_read_play(AVFormatContext *s);
-
-extern int ff_concatgen_read_pause(AVFormatContext *s);
+#include "concatgen.h"
 
 /* The ffmpeg codecs we support, and the IDs they have in the file */
 static const AVCodecTag codec_m3u_tags[] = {

Modified: concat/libavformat/pls.c
==============================================================================
--- concat/libavformat/pls.c	Wed Jul 29 16:41:37 2009	(r4837)
+++ concat/libavformat/pls.c	Wed Jul 29 19:47:08 2009	(r4838)
@@ -25,19 +25,7 @@
  *  @brief PLS playlist demuxer
  */
 
-#include "playlist.h"
-
-extern int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt);
-
-extern int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags);
-
-extern int64_t ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit);
-
-extern int ff_concatgen_read_close(AVFormatContext *s);
-
-extern int ff_concatgen_read_play(AVFormatContext *s);
-
-extern int ff_concatgen_read_pause(AVFormatContext *s);
+#include "concatgen.h"
 
 /* The ffmpeg codecs we support, and the IDs they have in the file */
 static const AVCodecTag codec_pls_tags[] = {

Modified: concat/libavformat/xspf.c
==============================================================================
--- concat/libavformat/xspf.c	Wed Jul 29 16:41:37 2009	(r4837)
+++ concat/libavformat/xspf.c	Wed Jul 29 19:47:08 2009	(r4838)
@@ -25,22 +25,7 @@
  *  @brief XSPF playlist demuxer
  */
 
-#include "avformat.h"
-
-
-#include "playlist.h"
-
-extern int ff_concatgen_read_packet(AVFormatContext *s, AVPacket *pkt);
-
-extern int ff_concatgen_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags);
-
-extern int64_t ff_concatgen_read_timestamp(AVFormatContext *s, int stream_index, int64_t *pos, int64_t pos_limit);
-
-extern int ff_concatgen_read_close(AVFormatContext *s);
-
-extern int ff_concatgen_read_play(AVFormatContext *s);
-
-extern int ff_concatgen_read_pause(AVFormatContext *s);
+#include "concatgen.h"
 
 /* The ffmpeg codecs we support, and the IDs they have in the file */
 static const AVCodecTag codec_xspf_tags[] = {