[Mplayer-cvslog] CVS: main configure, 1.847, 1.848 Makefile, 1.284, 1.285

[Michael Niedermayer CVS]

CVS change done by Michael Niedermayer CVS

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

Modified Files:
	configure Makefile 
Log Message:
demux_lavf


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.847
retrieving revision 1.848
diff -u -r1.847 -r1.848
--- configure	6 Apr 2004 16:13:52 -0000	1.847
+++ configure	11 Apr 2004 14:26:04 -0000	1.848
@@ -199,6 +199,7 @@
   --disable-divx4linux   disable DivX4linux/Divx5linux codec [autodetect]
   --enable-opendivx      enable _old_ OpenDivx codec [disable]
   --disable-libavcodec   disable libavcodec [autodetect]
+  --disable-libavformat  disable libavformat [autodetect]
   --enable-libfame       enable libfame realtime encoder [autodetect]
   --enable-vorbis        build with OggVorbis support [autodetect]
   --enable-tremor        build with integer-only OggVorbis support [disabled]
@@ -1133,6 +1134,7 @@
 # If autodetection is available then the third state is: auto
 _libavcodec=auto
 _libavcodecso=auto 
+_libavformat=auto
 _fame=auto
 _mp1e=no
 _mencoder=yes
@@ -1412,6 +1414,8 @@
   --disable-opendivx)	_opendivx=no	;;
   --enable-libavcodec)	_libavcodec=yes	;;
   --disable-libavcodec)	_libavcodec=no	;;
+  --enable-libavformat)	_libavformat=yes;;
+  --disable-libavformat)	_libavformat=no	;;
   --enable-libfame)	_fame=yes	;;
   --disable-libfame)	_fame=no	;;
   --enable-lirc)	_lirc=yes	;;
@@ -5029,6 +5033,20 @@
   echores "$_libavcodec"
 fi
 
+echocheck "FFmpeg libavformatc (static)"
+if test "$_libavformat" = auto ; then
+  # Note: static linking is preferred to dynamic linking
+  _libavformat=no
+  if test -d libavformat && test -f libavformat/utils.c ; then
+    _libavformat=yes
+    echores "yes"
+  else
+    echores "no"
+  fi
+else
+  echores "$_libavformat"
+fi
+
 _def_haveffpostprocess='no'
 if test -d libavcodec && test -f libavcodec/libpostproc/postprocess.h ; then
    _def_haveffpostprocess='yes'
@@ -5076,6 +5094,13 @@
   _nocodecmodules="libavcodec $_nocodecmodules"
 fi
 
+_def_libavformat='#undef USE_LIBAVFORMAT'
+if test "$_libavformat" = yes ; then
+  _def_libavformat='#define USE_LIBAVFORMAT 1'
+  _ld_libavformat='libavformat/libavformat.a'
+  _dep_libavformat='libavformat/libavformat.a'
+fi
+
 echocheck "libdv-0.9.5+"
 if test "$_libdv" = auto ; then
   _libdv=no
@@ -5918,7 +5943,7 @@
 HAVE_XVMC_ACCEL = $_xvmc
 
 # for libavcodec:
-SRC_PATH=.
+SRC_PATH=..
 LIBPREF=lib
 LIBSUF=.a
 SLIBPREF=lib
@@ -5961,8 +5986,9 @@
 W32_LIB = $_ld_win32
 DS_DEP = $_dep_dshow
 DS_LIB = $_ld_dshow
-AV_DEP = $_dep_libavcodec
-AV_LIB = $_ld_libavcodec
+AV_DEP = $_dep_libavcodec $_dep_libavformat
+AV_LIB = $_ld_libavcodec $_ld_libavformat
+CONFIG_LIBAVFORMAT = $_libavformat
 ZORAN = $_zr
 FAME = $_fame
 FAME_LIB = $_ld_fame
@@ -6268,6 +6294,9 @@
 $_def_libavcodec
 $_def_libavcodecso
 
+/* ffmpeg's libavformat support (requires libavformat source) */
+$_def_libavformat
+
 /* risky codecs */
 #define CONFIG_RISKY 1
 

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -r1.284 -r1.285
--- Makefile	6 Apr 2004 00:04:48 -0000	1.284
+++ Makefile	11 Apr 2004 14:26:04 -0000	1.285
@@ -39,7 +39,7 @@
 
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(FREETYPE_INC) $(EXTRA_INC) $(CDPARANOIA_INC) $(SDL_INC) $(X11_INC) $(FRIBIDI_INC) $(DVB_INC) $(XVID_INC) $(FONTCONFIG_INC) # -Wall
 
-PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libao2 drivers osdep postproc input libvo libaf
+PARTS = libmpdemux libmpcodecs mp3lib liba52 libmpeg2 libavcodec libavformat libao2 drivers osdep postproc input libvo libaf
 ifeq ($(INTERNAL_FAAD),yes)
 COMMON_LIBS += libfaad2/libfaad2.a 
 PARTS += libfaad2
@@ -140,6 +140,9 @@
 libavcodec/libavcodec.a:
 	$(MAKE) -C libavcodec LIBPREF=lib LIBSUF=.a
 
+libavformat/libavformat.a:
+	$(MAKE) -C libavformat LIBPREF=lib LIBSUF=.a
+
 libmpeg2/libmpeg2.a:
 	$(MAKE) -C libmpeg2
 
@@ -304,6 +307,7 @@
 	-rm -f *.o *.a .depend configure.log codecs.conf.h
 	@for a in $(PARTS); do $(MAKE) -C $$a distclean; done
 	-$(MAKE) -C libavcodec distclean LIBPREF=lib LIBSUF=.a
+	-$(MAKE) -C libavformat distclean LIBPREF=lib LIBSUF=.a
 
 strip:
 	strip -s $(ALL_PRG)