[Mplayer-cvslog] CVS: main configure,1.98,1.99 Makefile,1.48,1.49

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv26927

Modified Files:
	configure Makefile 
Log Message:
ffmpeg support

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- configure	4 Jul 2001 10:45:20 -0000	1.98
+++ configure	6 Jul 2001 03:22:14 -0000	1.99
@@ -377,6 +377,7 @@
 _dshow=yes
 _fastmemcpy=yes
 _streaming=no
+_libavcodec=no
 
 _x=1
 _y=1
@@ -438,6 +439,11 @@
  fi
 fi
 
+if [ -d libavcodec ]; then
+ if [ -e libavcodec/Makefile ]; then
+  _libavcodec=yes
+ fi
+fi
 
 if [ -c /dev/mga_vid ]; then
  _mga=yes
@@ -1140,6 +1146,7 @@
 echo "Checking for DeCSS support ... $_css"
 echo "Checking for PNG support ... $_png"
 echo "Checking for DirectShow ... $_dshow"
+echo "Checking for libavcodec ... $_libavcodec"
 echo "Checking for fastmemcpy ... $_fastmemcpy"
 echo "Extra libs : $_extralibdir"
 echo "Extra headers : $_extraincdir"
@@ -1192,6 +1199,16 @@
    _dshow='#undef USE_DIRECTSHOW'
 fi
 
+if [ $_libavcodec = yes ]; then
+   _lavclib='-Llibavcodec -lavcodec'
+   _lavcdep='libavcodec/libavcodec.a'
+   _libavcodec='#define USE_LIBAVCODEC'
+else
+   _lavclib=''
+   _lavcdep=''
+   _libavcodec='#undef USE_LIBAVCODEC'
+fi
+
 if [ $_fastmemcpy = yes ]; then
    _fastmemcpy='#define USE_FASTMEMCPY'
 else
@@ -1520,8 +1537,8 @@
 CSS_LIB = $_csslib
 CSS_INC = $_cssinc
 SDL_INC = $_sdlcflags
-DS_DEP = $_dshowdep
-DS_LIB = $_dshowlib
+DS_DEP = $_dshowdep $_lavcdep
+DS_LIB = $_dshowlib $_lavclib
 ALSA_LIB = $_alsalib
 ESD_LIB = $_esdlib
 ARCH_LIBS = $_archlibs
@@ -1608,6 +1625,9 @@
 
 /* DirectShow support */
 $_dshow
+
+/* ffmpeg's libavcodec support (requires libavcodec source) */
+$_libavcodec
 
 /* Use 3dnow/mmxext/sse/mmx optimized fast memcpy() [maybe buggy... signal 4]*/
 $_fastmemcpy

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- Makefile	26 Jun 2001 23:15:56 -0000	1.48
+++ Makefile	6 Jul 2001 03:22:14 -0000	1.49
@@ -40,6 +40,9 @@
 loader/DirectShow/libDS_Filter.a:
 	$(MAKE) -C loader/DirectShow
 
+libavcodec/libavcodec.a:
+	$(MAKE) -C libavcodec
+
 libmpeg2/libmpeg2.a:
 	$(MAKE) -C libmpeg2
 


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog