Revert r24931, it broke Win32 and some BSD compiles (yay fate).

[ffmpeg] / libavcodec / ac3.h

diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h
index 7391be1b829781abc135c8cf0c9e8ca7b97da517..9c8dc4870e7a278fc63d750036ab821f485a7619 100644 (file)
--- a/libavcodec/ac3.h
+++ b/libavcodec/ac3.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * @file libavcodec/ac3.h
+ * @file
  * Common code between the AC-3 encoder and decoder.
  */
 
@@ -100,6 +100,7 @@ typedef struct {
     uint32_t bit_rate;
     uint8_t channels;
     uint16_t frame_size;
+    int64_t channel_layout;
     /** @} */
 } AC3HeaderInfo;
 
@@ -113,7 +114,7 @@ typedef enum {
 void ac3_common_init(void);
 
 /**
- * Calculates the log power-spectral density of the input signal.
+ * Calculate the log power-spectral density of the input signal.
  * This gives a rough estimate of signal power in the frequency domain by using
  * the spectral envelope (exponents).  The psd is also separately grouped
  * into critical bands for use in the calculating the masking curve.
@@ -130,8 +131,8 @@ void ff_ac3_bit_alloc_calc_psd(int8_t *exp, int start, int end, int16_t *psd,
                                int16_t *band_psd);
 
 /**
- * Calculates the masking curve.
- * First, the excitation is calculated using parameters in \p s and the signal
+ * Calculate the masking curve.
+ * First, the excitation is calculated using parameters in s and the signal
  * power in each critical band.  The excitation is compared with a predefined
  * hearing threshold table to produce the masking curve.  If delta bit
  * allocation information is provided, it is used for adjusting the masking
@@ -158,9 +159,9 @@ int ff_ac3_bit_alloc_calc_mask(AC3BitAllocParameters *s, int16_t *band_psd,
                                int16_t *mask);
 
 /**
- * Calculates bit allocation pointers.
+ * Calculate bit allocation pointers.
  * The SNR is the difference between the masking curve and the signal.  AC-3
- * uses this value for each frequency bin to allocate bits.  The \p snroffset
+ * uses this value for each frequency bin to allocate bits.  The snroffset
  * parameter is a global adjustment to the SNR for all bins.
  *
  * @param[in]  mask       masking curve