[MPlayer-cvslog] CVS: main/libmpdemux Makefile, 1.98, 1.99 demux_lavf.c, 1.22, 1.23 muxer_lavf.c, 1.15, 1.16 demuxer.c, 1.211, 1.212 muxer.c, 1.12, 1.13

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv2047/libmpdemux

Modified Files:
	Makefile demux_lavf.c muxer_lavf.c demuxer.c muxer.c 
Log Message:
added support for external libavformat

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/Makefile,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- Makefile	14 Dec 2005 21:52:41 -0000	1.98
+++ Makefile	9 Jan 2006 19:35:44 -0000	1.99
@@ -64,7 +64,6 @@
         demux_film.c \
         demux_fli.c \
         demux_gif.c \
-        demux_lavf.c \
         demux_lmlm4.c \
         demux_mf.c \
         demux_mov.c \
@@ -117,7 +116,12 @@
 endif
 ifeq ($(CONFIG_LIBAVFORMAT),yes)
 LIBAV_INC += -I../libavformat
-SRCS += muxer_lavf.c
+SRCS += demux_lavf.c \
+	muxer_lavf.c
+endif
+ifeq ($(CONFIG_LIBAVFORMAT_SO),yes)
+SRCS += demux_lavf.c \
+	muxer_lavf.c
 endif
 
 ifeq ($(MPLAYER_NETWORK),yes)

Index: demux_lavf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_lavf.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- demux_lavf.c	10 Oct 2005 05:45:38 -0000	1.22
+++ demux_lavf.c	9 Jan 2006 19:35:44 -0000	1.23
@@ -28,10 +28,12 @@
 #include "demuxer.h"
 #include "stheader.h"
 
-#ifdef USE_LIBAVFORMAT
-
+#ifdef USE_LIBAVFORMAT_SO
+#include <ffmpeg/avformat.h>
+#else
 #include "avformat.h"
 #include "avi.h"
+#endif
 
 #define PROBE_BUF_SIZE 2048
 
@@ -451,4 +453,3 @@
   demux_lavf_control
 };
 
-#endif // USE_LIBAVFORMAT

Index: muxer_lavf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_lavf.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- muxer_lavf.c	2 Dec 2005 19:43:36 -0000	1.15
+++ muxer_lavf.c	9 Jan 2006 19:35:44 -0000	1.16
@@ -17,7 +17,11 @@
 #include "demuxer.h"
 #include "stheader.h"
 #include "m_option.h"
+#ifdef USE_LIBAVFORMAT_SO
+#include <ffmpeg/avformat.h>
+#else
 #include "avformat.h"
+#endif
 
 extern unsigned int codec_get_wav_tag(int id);
 extern enum CodecID codec_get_bmp_id(unsigned int tag);

Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- demuxer.c	17 Dec 2005 10:46:48 -0000	1.211
+++ demuxer.c	9 Jan 2006 19:35:44 -0000	1.212
@@ -62,7 +62,9 @@
 extern demuxer_desc_t demuxer_desc_xmms;
 extern demuxer_desc_t demuxer_desc_mpeg_ty;
 extern demuxer_desc_t demuxer_desc_rtp;
+#if defined(USE_LIBAVFORMAT) ||  defined(USE_LIBAVFORMAT_SO)
 extern demuxer_desc_t demuxer_desc_lavf;
+#endif
 extern demuxer_desc_t demuxer_desc_aac;
 
 demuxer_desc_t* demuxer_list[] = {
@@ -119,7 +121,7 @@
 #ifdef STREAMING_LIVE555
   &demuxer_desc_rtp,
 #endif
-#ifdef USE_LIBAVFORMAT
+#if defined(USE_LIBAVFORMAT) ||  defined(USE_LIBAVFORMAT_SO)
   &demuxer_desc_lavf,
 #endif
   &demuxer_desc_aac,

Index: muxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- muxer.c	29 Nov 2005 22:04:57 -0000	1.12
+++ muxer.c	9 Jan 2006 19:35:44 -0000	1.13
@@ -35,7 +35,7 @@
         if(! muxer_init_muxer_rawaudio(muxer))
           return NULL;
         break;
-#ifdef USE_LIBAVFORMAT
+#if defined(USE_LIBAVFORMAT) || defined(USE_LIBAVFORMAT_SO)
       case MUXER_TYPE_LAVF:
         if(! muxer_init_muxer_lavf(muxer))
 	  return NULL;