Commit 1997a988 authored by Michael Niedermayer's avatar Michael Niedermayer

disable libtheora, this change leaves all the libtheora related code in svn...

disable libtheora, this change leaves all the libtheora related code in svn for now but just disables it in configure
IMO libtheora support should be completely removed but at least under no circumstances must it disable or override our native decoder by default

Originally committed as revision 5812 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 230e9d4c
...@@ -32,7 +32,6 @@ show_help(){ ...@@ -32,7 +32,6 @@ show_help(){
echo " --enable-mp3lame enable MP3 encoding via libmp3lame [default=no]" echo " --enable-mp3lame enable MP3 encoding via libmp3lame [default=no]"
echo " --enable-libogg enable Ogg support via libogg [default=no]" echo " --enable-libogg enable Ogg support via libogg [default=no]"
echo " --enable-vorbis enable Vorbis support via libvorbis [default=no]" echo " --enable-vorbis enable Vorbis support via libvorbis [default=no]"
echo " --enable-theora enable Theora support via libtheora [default=no]"
echo " --enable-faad enable FAAD support via libfaad [default=no]" echo " --enable-faad enable FAAD support via libfaad [default=no]"
echo " --enable-faadbin build FAAD support with runtime linking [default=no]" echo " --enable-faadbin build FAAD support with runtime linking [default=no]"
echo " --enable-faac enable FAAC support via libfaac [default=no]" echo " --enable-faac enable FAAC support via libfaac [default=no]"
...@@ -764,9 +763,6 @@ for opt do ...@@ -764,9 +763,6 @@ for opt do
--enable-vorbis) vorbis="yes" --enable-vorbis) vorbis="yes"
pkg_requires="$pkg_requires vorbis vorbisenc" pkg_requires="$pkg_requires vorbis vorbisenc"
;; ;;
--enable-theora) theora="yes"
pkg_requires="$pkg_requires theora"
;;
--enable-faad) faad="yes" --enable-faad) faad="yes"
;; ;;
--enable-faadbin) faadbin="yes" --enable-faadbin) faadbin="yes"
...@@ -1514,7 +1510,6 @@ echo "libgsm enabled $libgsm" ...@@ -1514,7 +1510,6 @@ echo "libgsm enabled $libgsm"
echo "mp3lame enabled $mp3lame" echo "mp3lame enabled $mp3lame"
echo "libogg enabled $libogg" echo "libogg enabled $libogg"
echo "Vorbis enabled $vorbis" echo "Vorbis enabled $vorbis"
echo "Theora enabled $theora"
echo "FAAD enabled $faad" echo "FAAD enabled $faad"
echo "faadbin enabled $faadbin" echo "faadbin enabled $faadbin"
echo "FAAC enabled $faac" echo "FAAC enabled $faac"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment