Vorbis: disable encoder code when SOUT is disabled

21fe00fa · Jean-Baptiste Kempf · 889cc775 · 21fe00fa
Commit 21fe00fa authored Apr 11, 2012 by Jean-Baptiste Kempf
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 7 deletions

modules/codec/vorbis.c modules/codec/vorbis.c +9 -7

No files found.
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -42,18 +42,20 @@
 #include <ogg/ogg.h>

 #ifdef MODULE_NAME_IS_tremor
-#include <tremor/ivorbiscodec.h>
-#define INTERLEAVE_TYPE int32_t
+# include <tremor/ivorbiscodec.h>
+# define INTERLEAVE_TYPE int32_t

 #else
-#include <vorbis/vorbisenc.h>
-#define INTERLEAVE_TYPE float
-#define HAVE_VORBIS_ENCODER
+# include <vorbis/codec.h>
+# define INTERLEAVE_TYPE float

-# ifndef OV_ECTL_RATEMANAGE_AVG
+# ifdef ENABLE_SOUT
+#  define HAVE_VORBIS_ENCODER
+#  include <vorbis/vorbisenc.h>
+#  ifndef OV_ECTL_RATEMANAGE_AVG
 #   define OV_ECTL_RATEMANAGE_AVG 0x0
+#  endif
 # endif
-
 #endif

 /*****************************************************************************