changeset 36782:06344efeded3

configure: improve FFmpeg check. If internal FFmpeg is not available we should fall back to external automatically instead of trying to build without (which is currently broken it seems). Also we can compile without internal copy as long as the necessary headers can be found. Two are required that FFmpeg does not install: libavformat/internal.h libavutil/x86/asm.h
author reimar
date Mon, 17 Feb 2014 23:25:32 +0000
parents e5c790cab2e8
children 5df05eaefb67
files configure
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Mon Feb 17 22:34:27 2014 +0000
+++ b/configure	Mon Feb 17 23:25:32 2014 +0000
@@ -7055,12 +7055,11 @@
 
 
 echocheck "FFmpeg"
-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/libavutil && ffmpeg_a=yes && ffmpeg=yes
-elif test "$ffmpeg_so" = auto ; then
+  test -d ffmpeg/libavcodec && ffmpeg_a=yes && ffmpeg_so=no && ffmpeg=yes
+fi
+if test "$ffmpeg_so" = auto ; then
   ffmpeg_so=no
   if $_pkg_config --exists libavutil ; then
     inc_ffmpeg=$($_pkg_config --cflags libswscale libavformat libavcodec libavutil)