[MPlayer-cvslog] CVS: main Makefile, 1.326, 1.327 configure, 1.1034, 1.1035 mencoder.c, 1.303, 1.304

[Alexander Strasser beastd]

CVS change done by Alexander Strasser (beastd)

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

Modified Files:
	Makefile configure mencoder.c 
Log Message:
Support new static libavcodec (depends on libavutil).


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.326
retrieving revision 1.327
diff -u -r1.326 -r1.327
--- Makefile	10 Jul 2005 17:14:09 -0000	1.326
+++ Makefile	1 Aug 2005 20:16:55 -0000	1.327
@@ -8,6 +8,14 @@
 
 PRG_CFG = codec-cfg
 
+LIBAV_INC =
+ifeq ($(CONFIG_LIBAVUTIL),yes)
+LIBAV_INC += -I./libavutil
+endif
+ifeq ($(CONFIG_LIBAVCODEC),yes)
+LIBAV_INC += -I./libavcodec
+endif
+
 # Do not strip the binaries at installation
 ifeq ($(STRIPBINARIES),yes)
 INSTALLSTRIP = -s
@@ -129,6 +137,7 @@
          $(SDL_INC) \
          $(X11_INC) \
          $(XVID_INC) \
+         $(LIBAV_INC) \
 
 #CFLAGS += -Wall
 
@@ -292,6 +301,9 @@
 loader/dmo/libDMO_Filter.a:
 	$(MAKE) -C loader/dmo
 
+libavutil/libavutil.a:
+	$(MAKE) -C libavutil LIBPREF=lib LIBSUF=.a
+
 libavcodec/libavcodec.a:
 	$(MAKE) -C libavcodec LIBPREF=lib LIBSUF=.a
 

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1034
retrieving revision 1.1035
diff -u -r1.1034 -r1.1035
--- configure	30 Jul 2005 01:07:27 -0000	1.1034
+++ configure	1 Aug 2005 20:16:55 -0000	1.1035
@@ -5859,6 +5859,13 @@
   _noinputmodules="live.com $_noinputmodules"
 fi
 
+echocheck "FFmpeg libavutil (static)"
+if test -d libavutil ; then
+  _libavutil=yes
+else
+  _libavutil=no
+fi
+echores "$_libavutil"
 
 echocheck "FFmpeg libavcodec (static)"
 if test "$_libavcodec" = auto ; then
@@ -5866,8 +5873,26 @@
   _libavcodec=no
   if test -d libavcodec && test -f libavcodec/utils.c ; then
     if grep avcodec_find_encoder_by_name libavcodec/utils.c > /dev/null 2>&1 ; then
-      _libavcodec=yes
-      echores "yes"
+      # check if libavutil is a required
+      cat > $TMPC << EOF
+#include "libavcodec/avcodec.h"
+#if LIBAVCODEC_BUILD >= 3211265
+#error We need libavutil!
+#endif
+int main(void) { return 0; }
+EOF
+      
+      if cc_check -I. -I./libavutil; then
+        _libavutil_required="no"
+      else
+        _libavutil_required="yes"
+      fi
+      if test "$_libavutil_required" != "$_libavutil"; then
+        _libavcodec="no (libavutil availability does not fit libavcodec version)"
+      else
+        _libavcodec="yes"
+      fi
+      echores $_libavcodec
     else
       echores "no (old ffmpeg version, use CVS !)"
     fi
@@ -5930,6 +5955,10 @@
   _dep_libavcodec='libavcodec/libavcodec.a'
   _def_ffpostprocess='#define FF_POSTPROCESS 1'
   _codecmodules="libavcodec $_codecmodules"
+  if test "$_libavutil" = yes; then
+    _ld_libavutil='libavutil/libavutil.a'
+    _dep_libavutil='libavutil/libavutil.a'
+  fi
 elif test "$_libavcodecso" = yes ; then
   _def_libavcodec='#define USE_LIBAVCODEC 1'
   _def_libavcodecso='#define USE_LIBAVCODEC_SO 1'
@@ -7003,8 +7032,9 @@
 W32_LIB = $_ld_win32
 DS_DEP = $_dep_dshow
 DS_LIB = $_ld_dshow
-AV_DEP = $_dep_libavcodec $_dep_libavformat
-AV_LIB = $_ld_libavcodec $_ld_libavformat
+AV_DEP = $_dep_libavutil $_dep_libavcodec $_dep_libavformat
+AV_LIB = $_ld_libavformat $_ld_libavcodec $_ld_libavutil 
+CONFIG_LIBAVUTIL = $_libavutil_required
 CONFIG_LIBAVCODEC = $_libavcodec
 CONFIG_LIBAVFORMAT = $_libavformat
 ZORAN = $_zr

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -r1.303 -r1.304
--- mencoder.c	31 Jul 2005 00:26:04 -0000	1.303
+++ mencoder.c	1 Aug 2005 20:16:55 -0000	1.304
@@ -80,7 +80,7 @@
 #ifdef USE_LIBAVCODEC_SO
 #include <ffmpeg/avcodec.h>
 #else
-#include "libavcodec/avcodec.h"
+#include "avcodec.h"
 #endif
 #endif