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

[gkovacs]

Author: gkovacs
Date: Mon Jul 13 00:04:03 2009
New Revision: 4686

Log:
fixed concatgen includes and linking

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

Modified: concat/libavformat/Makefile.diff
==============================================================================
--- concat/libavformat/Makefile.diff	Sun Jul 12 23:54:20 2009	(r4685)
+++ concat/libavformat/Makefile.diff	Mon Jul 13 00:04:03 2009	(r4686)
@@ -1,12 +1,12 @@
 diff --git a/libavformat/Makefile b/libavformat/Makefile
-index 8e8a869..625225d 100644
+index 8e8a869..7456eac 100644
 --- a/libavformat/Makefile
 +++ b/libavformat/Makefile
 @@ -34,6 +34,7 @@ OBJS-$(CONFIG_BETHSOFTVID_DEMUXER)       += bethsoftvid.o
  OBJS-$(CONFIG_BFI_DEMUXER)               += bfi.o
  OBJS-$(CONFIG_C93_DEMUXER)               += c93.o vocdec.o voc.o
  OBJS-$(CONFIG_CAVSVIDEO_DEMUXER)         += raw.o
-+OBJS-$(CONFIG_CONCAT_DEMUXER)            += m3u.o pls.o xspf.o playlist.o concat.o concatgen.o datanode.o
++OBJS-$(CONFIG_CONCAT_DEMUXER)            += m3u.o pls.o xspf.o playlist.o concat.o concatgen.o
  OBJS-$(CONFIG_CRC_MUXER)                 += crcenc.o
  OBJS-$(CONFIG_DAUD_DEMUXER)              += daud.o
  OBJS-$(CONFIG_DAUD_MUXER)                += daud.o

Modified: concat/libavformat/concat.h
==============================================================================
--- concat/libavformat/concat.h	Sun Jul 12 23:54:20 2009	(r4685)
+++ concat/libavformat/concat.h	Mon Jul 13 00:04:03 2009	(r4686)
@@ -19,15 +19,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "concatgen.h"
+#include "playlist.h"
 
 #ifndef AVFORMAT_CONCAT_H
 #define AVFORMAT_CONCAT_H
 
-//int concat_probe(AVProbeData *p);
-
-//int concat_read_header(AVFormatContext *s, AVFormatParameters *ap);
-
 AVInputFormat* concat_alloc_demuxer(void);
 
 #endif /* AVFORMAT_CONCAT_H */

Modified: concat/libavformat/concatgen.c
==============================================================================
--- concat/libavformat/concatgen.c	Sun Jul 12 23:54:20 2009	(r4685)
+++ concat/libavformat/concatgen.c	Mon Jul 13 00:04:03 2009	(r4686)
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "concatgen.h"
+#include "playlist.h"
 
 int ff_concatgen_read_packet(AVFormatContext *s,
                              AVPacket *pkt)

Modified: concat/libavformat/m3u.c
==============================================================================
--- concat/libavformat/m3u.c	Sun Jul 12 23:54:20 2009	(r4685)
+++ concat/libavformat/m3u.c	Mon Jul 13 00:04:03 2009	(r4686)
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "concatgen.h"
+#include "playlist.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	Sun Jul 12 23:54:20 2009	(r4685)
+++ concat/libavformat/pls.c	Mon Jul 13 00:04:03 2009	(r4686)
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "concatgen.h"
+#include "playlist.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	Sun Jul 12 23:54:20 2009	(r4685)
+++ concat/libavformat/xspf.c	Mon Jul 13 00:04:03 2009	(r4686)
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "concatgen.h"
+#include "playlist.h"
 
 /* The ffmpeg codecs we support, and the IDs they have in the file */
 static const AVCodecTag codec_xspf_tags[] = {