Mercurial > mplayer.hg
changeset 34036:87cc9c910c06
The GPL'd FFmpeg prores decoder changed its name.
| author | cehoyos |
|---|---|
| date | Fri, 23 Sep 2011 07:35:46 +0000 |
| parents | 5daa51a194ed |
| children | ce4eacdd7f5a |
| files | configure etc/codecs.conf |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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"'