Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / ac3.h

diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h
index 6baf98939410c216665ceefe3e75a6b70d0cc5e8..47878c39cd0cbe37308cad5ec2b2d0aff52bf929 100644 (file)
--- a/libavcodec/ac3.h
+++ b/libavcodec/ac3.h
@@ -28,7 +28,8 @@
 #define AVCODEC_AC3_H
 
 #define AC3_MAX_CODED_FRAME_SIZE 3840 /* in bytes */
-#define AC3_MAX_CHANNELS 6 /* including LFE channel */
+#define AC3_MAX_CHANNELS 7            /**< maximum number of channels, including coupling channel */
+#define CPL_CH 0                      /**< coupling channel index */
 
 #define AC3_MAX_COEFS   256
 #define AC3_BLOCK_SIZE  256
@@ -158,6 +159,9 @@ typedef struct AC3EncOptions {
 
     /* other encoding options */
     int allow_per_frame_metadata;
+    int stereo_rematrixing;
+    int channel_coupling;
+    int cpl_start;    
 } AC3EncOptions;