[vlc-commits] Vorbis: disable encoder code when SOUT is disabled

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Apr 11 11:00:37 2012 +0200| [21fe00fa8e0b48c9ef20f801dd8665902ee76a56] | committer: Jean-Baptiste Kempf

Vorbis: disable encoder code when SOUT is disabled

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=21fe00fa8e0b48c9ef20f801dd8665902ee76a56
---

 modules/codec/vorbis.c |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index 491c7b6..b085c47 100644
--- 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
 
 /*****************************************************************************