summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2009-12-04 17:06:04 +0000
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2009-12-04 17:06:04 +0000
commit0353446472d7641c79b28c22cb1136ee98235cbb (patch)
treefa3924c09a12733f2af9e7ead6a242f73d594931
parentec67ad7ba434b00631406a18d77b6c4872a6cd21 (diff)
downloadxine-lib-0353446472d7641c79b28c22cb1136ee98235cbb.tar.gz
xine-lib-0353446472d7641c79b28c22cb1136ee98235cbb.tar.bz2
Bump the FLAC decoder's priority above ffmpegaudio, and build it by default.
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac4
-rw-r--r--src/combined/decoder_flac.c2
3 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0e6d134dc..eee0753b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
xine-lib (1.1.1?) 20??-??-??
+ * Bump the FLAC decoder's priority above ffmpegaudio. This should fix
+ various problems with FLAC playback.
xine-lib (1.1.17) 2009-12-01
* Add support for Matroska SIMPLEBLOCK.
diff --git a/configure.ac b/configure.ac
index df262cc26..5317a4be1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1262,10 +1262,10 @@ dnl check for libFLAC
dnl ---------------------------------------------
AC_ARG_WITH([libflac],
- AS_HELP_STRING([--with-libflac], [build libFLAC-based decoder and demuxer]))
+ AS_HELP_STRING([--without-libflac], [don't build libFLAC-based decoder and demuxer]))
have_libflac="no"
-if test "x$with_libflac" = "xyes"; then
+if test "x$with_libflac" != "xno"; then
AM_PATH_LIBFLAC([have_libflac="yes"])
fi
diff --git a/src/combined/decoder_flac.c b/src/combined/decoder_flac.c
index e9a7fbb25..b774e0b90 100644
--- a/src/combined/decoder_flac.c
+++ b/src/combined/decoder_flac.c
@@ -426,7 +426,7 @@ static uint32_t audio_types[] = {
static const decoder_info_t dec_info_audio = {
audio_types, /* supported types */
- 5 /* priority */
+ 8 /* priority */
};
const plugin_info_t xine_plugin_info[] EXPORTED = {