Add stereo rematrixing support to the AC-3 encoders.

[ffmpeg] / libavcodec / xiph.h

diff --git a/libavcodec/xiph.h b/libavcodec/xiph.h
index 85cfeebaf7756d2a8792683d1f4231805713eedc..0cbb87035519575faafb784a362469a52908cacd 100644 (file)
--- a/libavcodec/xiph.h
+++ b/libavcodec/xiph.h
@@ -18,10 +18,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "common.h"
+#ifndef AVCODEC_XIPH_H
+#define AVCODEC_XIPH_H
+
+#include "libavutil/common.h"
 
 /**
- * Splits a single extradata buffer into the three headers that most
+ * Split a single extradata buffer into the three headers that most
  * Xiph codecs use. (e.g. Theora and Vorbis)
  * Works both with Matroska's packing and lavc's packing.
  *
@@ -36,3 +39,5 @@
 int ff_split_xiph_headers(uint8_t *extradata, int extradata_size,
                           int first_header_size, uint8_t *header_start[3],
                           int header_len[3]);
+
+#endif /* AVCODEC_XIPH_H */