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

[cehoyos]

Author: cehoyos
Date: Fri Sep 23 09:35:46 2011
New Revision: 34124

Log:
The GPL'd FFmpeg prores decoder changed its name.

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

Modified: trunk/configure
==============================================================================
--- trunk/configure	Wed Sep 21 16:20:04 2011	(r34123)
+++ trunk/configure	Fri Sep 23 09:35:46 2011	(r34124)
@@ -634,7 +634,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_DECODER//)
+libavdecoders=$(echo $libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g' -e s/PRORES_GPL_DECODER//)
 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]')
@@ -6869,7 +6869,7 @@ echores "$_libopencore_amrwb"
 
 
 if test "$_libopencore_amrnb" = no && test "$_libopencore_amrwb" = no ; then
-  libavdecoders="$libavdecoders PRORES_DECODER"
+  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"'

Modified: trunk/etc/codecs.conf
==============================================================================
--- trunk/etc/codecs.conf	Wed Sep 21 16:20:04 2011	(r34123)
+++ trunk/etc/codecs.conf	Fri Sep 23 09:35:46 2011	(r34124)
@@ -3080,7 +3080,7 @@ videocodec ffprores
   fourcc apco
   fourcc ap4h
   driver ffmpeg
-  dll prores
+  dll prores_gpl
   out 422P10,444P10
 
 ; VSS codecs (http://vsofts.com/solutions.html):