[MPlayer-cvslog] r34193 - in trunk: configure etc/codecs.conf

[cehoyos]

Author: cehoyos
Date: Thu Oct 13 00:32:45 2011
New Revision: 34193

Log:
The GPL'd ProRes decoder from FFmpeg has been LGPL'd and renamed to 'prores'.

Modified:
   trunk/configure
   trunk/etc/codecs.conf

Modified: trunk/configure
==============================================================================
--- trunk/configure	Thu Oct 13 00:04:12 2011	(r34192)
+++ trunk/configure	Thu Oct 13 00:32:45 2011	(r34193)
@@ -654,7 +654,7 @@ _libopencore_amrnb=auto
 _libopencore_amrwb=auto
 libopenjpeg=auto
 libavdecoders_all=$(sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
-libavdecoders=$(echo $libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g' -e s/PRORES_GPL_DECODER//)
+libavdecoders=$(echo $libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g')
 libavencoders_all=$(sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
 libavencoders=$(echo $libavencoders_all | sed -e 's/ LIB[A-Z0-9_]*_ENCODER//g')
 libavparsers_all=$(sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
@@ -6830,14 +6830,6 @@ fi
 echores "$_libopencore_amrwb"
 
 
-if test "$_libopencore_amrnb" = no && test "$_libopencore_amrwb" = no ; then
-  libavdecoders="$libavdecoders PRORES_GPL_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
@@ -8583,7 +8575,7 @@ $def_yasm
 #endif
 
 #define FFMPEG_CONFIGURATION "--enable-gpl --enable-postproc"
-$def_ffmpeg_license
+#define FFMPEG_LICENSE "GPL version 2 or later"
 
 #define LIBAV_CONFIGURATION FFMPEG_CONFIGURATION
 #define LIBAV_LICENSE FFMPEG_LICENSE

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Thu Oct 13 00:04:12 2011	(r34192)
+++ trunk/etc/codecs.conf	Thu Oct 13 00:32:45 2011	(r34193)
@@ -3119,20 +3119,8 @@ videocodec qtprores
   dll "AppleProResDecoder.qtx"
   out YUY2
 
-videocodec ffproreslgpl
-  info "FFmpeg ProRes, LGPL"
-  status working
-  fourcc apch
-  fourcc apcn
-  fourcc apcs
-  fourcc apco
-  fourcc ap4h
-  driver ffmpeg
-  dll prores_lgpl
-  out 422P10,444P10
-
-videocodec ffproresgpl
-  info "FFmpeg ProRes, GPL v2 only"
+videocodec ffprores
+  info "FFmpeg Apple ProRes"
   status working
   fourcc apch
   fourcc apcn
@@ -3140,11 +3128,11 @@ videocodec ffproresgpl
   fourcc apco
   fourcc ap4h
   driver ffmpeg
-  dll prores_gpl
+  dll prores
   out 422P10,444P10
 
-videocodec ffprores
-  info "FFmpeg Apple ProRes"
+videocodec ffproreslgpl
+  info "Libav ProRes"
   status working
   fourcc apch
   fourcc apcn
@@ -3152,7 +3140,7 @@ videocodec ffprores
   fourcc apco
   fourcc ap4h
   driver ffmpeg
-  dll prores
+  dll prores_lgpl
   out 422P10,444P10
 
 ; VSS codecs (http://vsofts.com/solutions.html):