[MPlayer-cvslog] r34111 - trunk/configure

[cehoyos]

Author: cehoyos
Date: Sun Sep 18 18:51:40 2011
New Revision: 34111

Log:
Use FFmpeg ProRes if both libopencore libraries are not enabled.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sat Sep 17 18:53:22 2011	(r34110)
+++ trunk/configure	Sun Sep 18 18:51:40 2011	(r34111)
@@ -6867,6 +6867,15 @@ else
 fi
 echores "$_libopencore_amrwb"
 
+
+if test "$_libopencore_amrnb" = no && test "$_libopencore_amrwb" = no ; then
+  libavdecoders="$libavdecoders PRORES_DECODER"
+  def_ffmpeg_license='#define FFMPEG_LICENSE "GPL version 2"'
+else
+  def_ffmpeg_license='#define FFMPEG_LICENSE "GPL version 2 or later"'
+fi
+
+
 echocheck "libdv-0.9.5+"
 if test "$_libdv" = auto ; then
   _libdv=no
@@ -8603,7 +8612,7 @@ $def_yasm
 #endif
 
 #define FFMPEG_CONFIGURATION "--enable-gpl --enable-postproc"
-#define FFMPEG_LICENSE "GPL version 2 or later"
+$def_ffmpeg_license
 
 #define LIBAV_CONFIGURATION FFMPEG_CONFIGURATION
 #define LIBAV_LICENSE FFMPEG_LICENSE