Mercurial > mplayer.hg

changeset 34023:d0ecb5d14258

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use FFmpeg ProRes if both libopencore libraries are not enabled.
author cehoyos
date Sun, 18 Sep 2011 16:51:40 +0000
parents fab5ae1132e7
children b48986b92913
files configure
diffstat 1 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sat Sep 17 16:53:22 2011 +0000
+++ b/configure	Sun Sep 18 16:51:40 2011 +0000
@@ -6867,6 +6867,15 @@
 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 @@
 #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