lavc: add a wrapper for AVCodecContext.get_buffer().

[ffmpeg] / libavcodec / ac3.h

diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h
index 4ed8c2523b289b53e93bb9edff44cb473126fecd..647432f02e9a06c774248967bebaadbcaae8d1fc 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
@@ -90,8 +91,8 @@ typedef struct AC3BitAllocParameters {
  * @struct AC3HeaderInfo
  * Coded AC-3 header values up to the lfeon element, plus derived values.
  */
-typedef struct {
-    /** @defgroup coded Coded elements
+typedef struct AC3HeaderInfo {
+    /** @name Coded elements
      * @{
      */
     uint16_t sync_word;
@@ -109,7 +110,7 @@ typedef struct {
     int num_blocks;                         ///< number of audio blocks
     /** @} */
 
-    /** @defgroup derived Derived values
+    /** @name Derived values
      * @{
      */
     uint8_t sr_shift;
@@ -117,7 +118,7 @@ typedef struct {
     uint32_t bit_rate;
     uint8_t channels;
     uint16_t frame_size;
-    int64_t channel_layout;
+    uint64_t channel_layout;
     /** @} */
 } AC3HeaderInfo;