Mercurial > mplayer.hg

changeset 32834:4224bc9b72ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Adjust build system to reflect merge of libavcore into libavutil in FFmpeg. patch by Johan Andersson, j i19 se
author diego
date Thu, 17 Feb 2011 11:15:19 +0000
parents c4891d10ddbb
children 19cc523b8e15
files Makefile configure
diffstat 2 files changed, 7 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu Feb 17 11:09:44 2011 +0000
+++ b/Makefile	Thu Feb 17 11:15:19 2011 +0000
@@ -682,7 +682,6 @@
 
 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 @@
         ffmpeg/libavcodec/sh4 \
         ffmpeg/libavcodec/sparc \
         ffmpeg/libavcodec/x86 \
-        ffmpeg/libavcore \
         ffmpeg/libavformat \
         ffmpeg/libavutil \
         ffmpeg/libavutil/arm \
@@ -774,7 +772,6 @@
 ADD_ALL_EXESUFS = $(1) $(call ADDSUFFIXES,$(EXESUFS_ALL),$(1))
 
 FFMPEGPARTS = libavcodec \
-              libavcore \
               libavformat \
               libavutil \
               libpostproc \
--- a/configure	Thu Feb 17 11:09:44 2011 +0000
+++ b/configure	Thu Feb 17 11:15:19 2011 +0000
@@ -6862,16 +6862,16 @@
   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