aboutsummaryrefslogtreecommitdiffstats
path: root/src/inputPlugins/_flac_common.h
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2008-01-26 22:17:09 +0000
committerEric Wong <normalperson@yhbt.net>2008-01-26 22:17:09 +0000
commite5a7c14227a2ca69e0e07ac9dc62d6e31f16121a (patch)
tree3a90c06682a7ec45d4466ea567becfa8619b2a8e /src/inputPlugins/_flac_common.h
parent8fe23fedd25c64a16acb2a95f3cd4b5eaee844ee (diff)
downloadmpd-e5a7c14227a2ca69e0e07ac9dc62d6e31f16121a.tar.gz
mpd-e5a7c14227a2ca69e0e07ac9dc62d6e31f16121a.tar.xz
mpd-e5a7c14227a2ca69e0e07ac9dc62d6e31f16121a.zip
fix builds that only have FLAC >= 1.1.3 but not Ogg-Vorbis
r7108 in trunk git-svn-id: https://svn.musicpd.org/mpd/branches/branch-0.13.0-fixes@7164 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to 'src/inputPlugins/_flac_common.h')
-rw-r--r--src/inputPlugins/_flac_common.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/inputPlugins/_flac_common.h b/src/inputPlugins/_flac_common.h
index e04e70693..f72702e99 100644
--- a/src/inputPlugins/_flac_common.h
+++ b/src/inputPlugins/_flac_common.h
@@ -80,15 +80,13 @@ typedef unsigned flac_read_status_size_t;
# ifdef HAVE_OGGFLAC
# include <OggFLAC/seekable_stream_decoder.h>
# endif
-#else /* FLAC_API_VERSION_CURRENT >= 7 */
+#else /* FLAC_API_VERSION_CURRENT > 7 */
- /* OggFLAC support is handled by our flac_plugin already, and
- * thus we *can* always have it if libFLAC was compiled with it */
-# ifndef HAVE_OGGFLAC
-# define HAVE_OGGFLAC 1
-# endif
+/*
+ * OggFLAC support is handled by our flac_plugin already, and
+ * thus we *can* always have it if libFLAC was compiled with it
+ */
# include "_ogg_common.h"
-# undef HAVE_OGGFLAC /* we don't need this defined anymore */
# include <FLAC/stream_decoder.h>
# define flac_decoder FLAC__StreamDecoder