[vlc-devel] [PATCH] Disable faad, lower priority of decoder below avcodec

[Rafaël Carré]

---
 configure.ac         |    6 ++----
 modules/codec/faad.c |    2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1a428e7..79c768d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,8 +245,6 @@ case "${host_os}" in
         ac_default_prefix="${build_dir}/vlc_install_dir"
         enable_macosx="yes"
         echo "  Assuming --enable-macosx"
-        enable_faad="yes"
-        echo "  Assuming --enable-faad"
         enable_flac="yes"
         echo "  Assuming --enable-flac"
         enable_theora="yes"
@@ -2833,8 +2831,8 @@ dnl
 dnl  faad decoder plugin
 dnl
 AC_ARG_ENABLE(faad,
-[  --enable-faad           faad codec (default disabled)])
-if test "${enable_faad}" = "yes"
+[  --disable-faad           faad codec (default disabled)])
+if test "${enable_faad}" != "no"
 then
   AC_ARG_WITH(faad-tree,
   [  --with-faad-tree=PATH   faad tree for static linking])
diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 7bda944..1f27da6 100644
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -43,7 +43,7 @@ static void Close( vlc_object_t * );
 
 vlc_module_begin ()
     set_description( N_("AAC audio decoder (using libfaad2)") )
-    set_capability( "decoder", 100 )
+    set_capability( "decoder", 50 )
     set_category( CAT_INPUT )
     set_subcategory( SUBCAT_INPUT_ACODEC )
     set_callbacks( Open, Close )
-- 
1.7.0.4