comparison configure @ 34036:87cc9c910c06

The GPL'd FFmpeg prores decoder changed its name.
author cehoyos
date Fri, 23 Sep 2011 07:35:46 +0000
parents d0ecb5d14258
children 422eb76aee70
comparison
equal deleted inserted replaced
34035:5daa51a194ed 34036:87cc9c910c06
632 _libavcodec_mpegaudio_hp=yes 632 _libavcodec_mpegaudio_hp=yes
633 _libopencore_amrnb=auto 633 _libopencore_amrnb=auto
634 _libopencore_amrwb=auto 634 _libopencore_amrwb=auto
635 libopenjpeg=auto 635 libopenjpeg=auto
636 libavdecoders_all=$(sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') 636 libavdecoders_all=$(sed -n 's/^[^#]*DEC.*(.*, *\(.*\)).*/\1_decoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
637 libavdecoders=$(echo $libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g' -e s/PRORES_DECODER//) 637 libavdecoders=$(echo $libavdecoders_all | sed -e 's/ LIB[A-Z0-9_]*_DECODER//g' -e s/PRORES_GPL_DECODER//)
638 libavencoders_all=$(sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') 638 libavencoders_all=$(sed -n 's/^[^#]*ENC.*(.*, *\(.*\)).*/\1_encoder/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
639 libavencoders=$(echo $libavencoders_all | sed -e 's/ LIB[A-Z0-9_]*_ENCODER//g') 639 libavencoders=$(echo $libavencoders_all | sed -e 's/ LIB[A-Z0-9_]*_ENCODER//g')
640 libavparsers_all=$(sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') 640 libavparsers_all=$(sed -n 's/^[^#]*PARSER.*(.*, *\(.*\)).*/\1_parser/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
641 libavparsers=$libavparsers_all 641 libavparsers=$libavparsers_all
642 libavbsfs_all=$(sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]') 642 libavbsfs_all=$(sed -n 's/^[^#]*BSF.*(.*, *\(.*\)).*/\1_bsf/p' ffmpeg/libavcodec/allcodecs.c | tr '[a-z]' '[A-Z]')
6867 fi 6867 fi
6868 echores "$_libopencore_amrwb" 6868 echores "$_libopencore_amrwb"
6869 6869
6870 6870
6871 if test "$_libopencore_amrnb" = no && test "$_libopencore_amrwb" = no ; then 6871 if test "$_libopencore_amrnb" = no && test "$_libopencore_amrwb" = no ; then
6872 libavdecoders="$libavdecoders PRORES_DECODER" 6872 libavdecoders="$libavdecoders PRORES_GPL_DECODER"
6873 def_ffmpeg_license='#define FFMPEG_LICENSE "GPL version 2"' 6873 def_ffmpeg_license='#define FFMPEG_LICENSE "GPL version 2"'
6874 else 6874 else
6875 def_ffmpeg_license='#define FFMPEG_LICENSE "GPL version 2 or later"' 6875 def_ffmpeg_license='#define FFMPEG_LICENSE "GPL version 2 or later"'
6876 fi 6876 fi
6877 6877