[MPlayer-cvslog] r32921 - in trunk: Makefile configure

[diego]

Author: diego
Date: Thu Feb 17 12:15:19 2011
New Revision: 32921

Log:
Adjust build system to reflect merge of libavcore into libavutil in FFmpeg.

patch by Johan Andersson, j i19 se

Modified:
   trunk/Makefile
   trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Thu Feb 17 12:09:44 2011	(r32920)
+++ trunk/Makefile	Thu Feb 17 12:15:19 2011	(r32921)
@@ -682,7 +682,6 @@ SRCS_MENCODER = mencoder.c \
 
 COMMON_LIBS-$(FFMPEG_A) += ffmpeg/libavformat/libavformat.a \
                            ffmpeg/libavcodec/libavcodec.a   \
-                           ffmpeg/libavcore/libavcore.a     \
                            ffmpeg/libavutil/libavutil.a     \
                            ffmpeg/libpostproc/libpostproc.a \
                            ffmpeg/libswscale/libswscale.a
@@ -716,7 +715,6 @@ DIRS =  . \
         ffmpeg/libavcodec/sh4 \
         ffmpeg/libavcodec/sparc \
         ffmpeg/libavcodec/x86 \
-        ffmpeg/libavcore \
         ffmpeg/libavformat \
         ffmpeg/libavutil \
         ffmpeg/libavutil/arm \
@@ -774,7 +772,6 @@ ADD_ALL_DIRS    = $(call ADDSUFFIXES,$(1
 ADD_ALL_EXESUFS = $(1) $(call ADDSUFFIXES,$(EXESUFS_ALL),$(1))
 
 FFMPEGPARTS = libavcodec \
-              libavcore \
               libavformat \
               libavutil \
               libpostproc \

Modified: trunk/configure
==============================================================================
--- trunk/configure	Thu Feb 17 12:09:44 2011	(r32920)
+++ trunk/configure	Thu Feb 17 12:15:19 2011	(r32921)
@@ -6862,16 +6862,16 @@ test -d ffmpeg/libavutil ||
   die "MPlayer will not compile without libavutil in the source tree."
 ffmpeg=no
 if test "$ffmpeg_a" = auto ; then
-  test -d ffmpeg/libavcore && ffmpeg_a=yes && ffmpeg=yes && extra_cflags="$extra_cflags -DFF_API_MAX_STREAMS=0"
+  test -d ffmpeg/libavutil && ffmpeg_a=yes && ffmpeg=yes && extra_cflags="$extra_cflags -DFF_API_MAX_STREAMS=0"
 elif test "$ffmpeg_so" = auto ; then
   ffmpeg_so=no
-  if $_pkg_config --exists libavcore ; then
-    inc_ffmpeg=$($_pkg_config --cflags libpostproc libswscale libavformat libavcodec libavutil libavcore)
-    _ld_tmp=$($_pkg_config --libs libpostproc libswscale libavformat libavcodec libavutil libavcore)
-    header_check libavcore/avcore.h $inc_ffmpeg $_ld_tmp &&
+  if $_pkg_config --exists libavutil ; then
+    inc_ffmpeg=$($_pkg_config --cflags libpostproc libswscale libavformat libavcodec libavutil)
+    _ld_tmp=$($_pkg_config --libs libpostproc libswscale libavformat libavcodec libavutil)
+    header_check libavutil/avutil.h $inc_ffmpeg $_ld_tmp &&
       extra_ldflags="$extra_ldflags $_ld_tmp" && ffmpeg_so=yes && ffmpeg=yes
-  elif header_check libavcore/avcore.h -lpostproc -lswscale -lavformat -lavcodec -lavutil -lavcore $_ld_lm ; then
-    extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil -lavcore"
+  elif header_check libavutil/avutil.h -lpostproc -lswscale -lavformat -lavcodec -lavutil $_ld_lm ; then
+    extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil"
     ffmpeg_so=yes
     ffmpeg=yes
   fi