# HG changeset patch # User cehoyos # Date 1316763346 0 # Node ID 87cc9c910c0664254f9fe1466174de2f27229d6c # Parent 5daa51a194ed74c4dcdb7e409b91e96db896d7b0 The GPL'd FFmpeg prores decoder changed its name. diff -r 5daa51a194ed -r 87cc9c910c06 configure --- a/configure Wed Sep 21 14:20:04 2011 +0000 +++ b/configure Fri Sep 23 07:35:46 2011 +0000 @@ -634,7 +634,7 @@ _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 @@ 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"' diff -r 5daa51a194ed -r 87cc9c910c06 etc/codecs.conf --- a/etc/codecs.conf Wed Sep 21 14:20:04 2011 +0000 +++ b/etc/codecs.conf Fri Sep 23 07:35:46 2011 +0000 @@ -3080,7 +3080,7 @@ fourcc apco fourcc ap4h driver ffmpeg - dll prores + dll prores_gpl out 422P10,444P10 ; VSS codecs (http://vsofts.com/solutions.html):