Merge from 1.2 tip.

--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c

1 files changed, 16 insertions, 32 deletions

diff --git a/m4/decoders.m4 b/m4/decoders.m4
index f5f8aac76..a6c53f5fc 100644
--- a/m4/decoders.m4
+++ b/m4/decoders.m4
@@ -4,13 +4,9 @@ dnl ---------------------------
 AC_DEFUN([XINE_DECODER_PLUGINS], [
     dnl a52dec (optional; enabled by default; external version allowed)
     AC_ARG_ENABLE([a52dec],
-                  [AS_HELP_STRING([--enable-a52dec], [Enable support for a52dec decoding library (default: enabled)])],
-                  [test x"$enableval" != x"no" && enable_a52dec="yes"])
-    AC_ARG_WITH([external-a52dec],
-                [AS_HELP_STRING([--with-external-a52dec], [Use external a52dec library (not recommended)])],
-                [test x"$withval" != x"no" && with_external_a52dec="yes"], [with_external_a52dec="no"])
+                  [AS_HELP_STRING([--enable-a52dec], [Enable support for a52dec decoding library (default: enabled, external: use external copy)])])
     if test x"$enable_a52dec" != x"no"; then
-        if test x"$with_external_a52dec" != x"no"; then
+        if test x"$enable_a52dec" == x"external"; then
             AC_CHECK_LIB([a52], [a52_init],
                          [AC_CHECK_HEADERS([a52dec/a52.h a52dec/a52_internal.h], [have_external_a52dec=yes], [have_external_a52dec=no],
                                            [#ifdef HAVE_SYS_TYPES_H
@@ -60,13 +56,9 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
 
     dnl FAAD (optional; enabled by default)
     AC_ARG_ENABLE([faad],
-                  [AS_HELP_STRING([--enable-faad], [Enable support for FAAD decoder (default: enabled)])],
-                  [test x"$enableval" != x"no" && enable_faad="yes"])
-    AC_ARG_WITH([external-faad],
-                [AS_HELP_STRING([--with-external-faad], [Use external FAAD decoeder])],
-                [test x"$withval" != x"no" && with_external_faad="yes"], [with_external_faad="no"])
+                  [AS_HELP_STRING([--enable-faad], [Enable support for FAAD decoder (default: enabled, external: use external copy)])])
     if test x"$enable_faad" != x"no"; then
-        if test x"$with_external_faad" != x"no"; then
+        if test x"$enable_faad" == x"external"; then
             AC_CHECK_LIB([faad], [NeAACDecInit],
                          [AC_CHECK_HEADERS([neaacdec.h], [have_external_faad=yes], [have_external_faad=no],
                                            [#include <neaacdec.h>])], [have_external_faad=no], [-lm])
@@ -98,6 +90,10 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
     PKG_CHECK_MODULES([FFMPEG_POSTPROC], [libpostproc])
     AC_DEFINE([HAVE_FFMPEG], 1, [Define this if you have ffmpeg library])
 
+	dnl Check presence of ffmpeg/avutil.h to see if it's old or new
+	dnl style for headers. The new style would be preferred actually...
+	AC_CHECK_HEADER([ffmpeg/avutil.h])
+   
     dnl gdk-pixbuf (optional; enabled by default)
     AC_ARG_ENABLE([gdkpixbuf],
                   [AS_HELP_STRING([--enable-gdkpixbuf], [Enable GdkPixbuf support (default: enabled)])],
@@ -126,13 +122,9 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
 
     dnl libdts (optional; enabled by default; external version allowed)
     AC_ARG_ENABLE([dts],
-                  [AS_HELP_STRING([--enable-dts], [Enable support for DTS decoding library (default: enabled)])],
-                  [test x"$enableval" != x"no" && enable_dts="yes"])
-    AC_ARG_WITH([external-libdts],
-                [AS_HELP_STRING([--with-external-libdts], [Use external libdts/libdca library (not recommended)])],
-                [test x"$withval" != x"no" && with_external_libdts="yes"], [with_external_libdts="no"])
+                  [AS_HELP_STRING([--enable-dts], [Enable support for DTS decoding library (default: enabled, external: use external copy)])])
     if test x"$enable_dts" != x"no"; then
-        if test x"$with_external_libdts" != x"no"; then
+        if test x"$enable_dts" == x"external"; then
             PKG_CHECK_MODULES([LIBDTS], [libdts], [have_external_dts=yes], [have_external_dts=no])
             if test x"$have_external_dts" != x"yes"; then
                 AC_MSG_RESULT([*** no usable version of libdts found, using internal copy ***])
@@ -140,7 +132,7 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
         else
             AC_MSG_RESULT([Using included libdts support])
         fi
-        if test x"$have_external_libdts" != x"yes"; then
+        if test x"$have_external_dts" != x"yes"; then
             LIBDTS_CFLAGS='-I$(top_srcdir)/contrib/libdca/include'
             LIBDTS_DEPS='$(top_builddir)/contrib/libdca/libdca.la'
             LIBDTS_LIBS='$(top_builddir)/contrib/libdca/libdca.la'
@@ -148,7 +140,7 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
         fi
     fi
     AM_CONDITIONAL([ENABLE_DTS], [test x"$enable_dts" != x"no"])
-    AM_CONDITIONAL([WITH_EXTERNAL_LIBDTS], [test x"$have_external_libdts" = x"yes"])
+    AM_CONDITIONAL([WITH_EXTERNAL_LIBDTS], [test x"$have_external_dts" = x"yes"])
 
 
     dnl libFLAC (optional; disabled by default)
@@ -221,13 +213,9 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
 
     dnl libmad (optional; enabled by default; external version allowed)
     AC_ARG_ENABLE([mad],
-                  [AS_HELP_STRING([--enable-mad], [Enable support for MAD decoding library (default: enabled)])],
-                  [test x"$enableval" != x"no" && enable_mad="yes"])
-    AC_ARG_WITH([external-libmad],
-                [AS_HELP_STRING([--with-external-libmad], [use external libmad library (not recommended)])],
-                [test x"$withval" != x"no" && with_external_libmad="yes"], [with_external_libmad="no"])
+                  [AS_HELP_STRING([--enable-mad], [Enable support for MAD decoding library (default: enabled, external: use external copy)])])
     if test x"$enable_mad" != x"no"; then
-        if test x"$with_external_libmad" != x"no"; then
+        if test x"$enable_mad" == x"external"; then
             PKG_CHECK_MODULES([LIBMAD], [mad],
                               [AC_CHECK_HEADERS([mad.h], [have_external_libmad=yes], [have_external_libmad=no])],
                               [have_external_libmad=no])
@@ -299,13 +287,9 @@ AC_DEFUN([XINE_DECODER_PLUGINS], [
 
     dnl libmpcdec (optional; enabled by default; external version allowed)
     AC_ARG_ENABLE([musepack],
-                  [AS_HELP_STRING([--enable-musepack], [Enable support for Musepack decoding (default: enabled)])],
-                  [test x"$enableval" != x"no" && enable_musepack="yes"])
-    AC_ARG_WITH([external-libmpcdec],
-                [AS_HELP_STRING([--with-external-libmpcdec], [Use external libmpc library])],
-                [test x"$withval" != x"no" && with_external_libmpcdec="yes"], [with_external_libmpcdec="no"])
+                  [AS_HELP_STRING([--enable-musepack], [Enable support for Musepack decoding (default: enabled, external: use external copy)])])
     if test x"$enable_musepack" != x"no"; then
-        if test x"$with_external_libmpcdec" != x"no"; then
+        if test x"$enable_musepack" == x"external"; then
             AC_CHECK_LIB([mpcdec], [mpc_decoder_decode],
                          [AC_CHECK_HEADERS([mpcdec/mpcdec.h], [have_external_libmpcdec=yes], [have_external_libmpcdec=no])],
                          [have_external_libmpcdec=no])