diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-03-04 16:25:17 -0500 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-03-04 16:48:09 -0500 |
| commit | b35743ffb46558be3a90c44f24a7de5fa2c15d85 (patch) | |
| tree | 9d409fb108db4c0680034967d25420c98423723e | |
| parent | a2704c9712ad35cc22e7e0d8a79b581c07fa383b (diff) | |
ac3: define AC3_MAX_CPL_BANDS and use it in ac3dec.h
| -rw-r--r-- | libavcodec/ac3.h | 1 | ||||
| -rw-r--r-- | libavcodec/ac3dec.h | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h index 405e3cd0a3..5e0b2621aa 100644 --- a/libavcodec/ac3.h +++ b/libavcodec/ac3.h @@ -36,6 +36,7 @@ #define AC3_FRAME_SIZE (AC3_MAX_BLOCKS * 256) #define AC3_WINDOW_SIZE (AC3_BLOCK_SIZE * 2) #define AC3_CRITICAL_BANDS 50 +#define AC3_MAX_CPL_BANDS 18 #include "ac3tab.h" diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h index 147e5e59bc..a5b1111123 100644 --- a/libavcodec/ac3dec.h +++ b/libavcodec/ac3dec.h @@ -103,12 +103,12 @@ typedef struct { int cpl_strategy_exists[AC3_MAX_BLOCKS];///< coupling strategy exists (cplstre) int channel_in_cpl[AC3_MAX_CHANNELS]; ///< channel in coupling (chincpl) int phase_flags_in_use; ///< phase flags in use (phsflginu) - int phase_flags[18]; ///< phase flags (phsflg) + int phase_flags[AC3_MAX_CPL_BANDS]; ///< phase flags (phsflg) int num_cpl_bands; ///< number of coupling bands (ncplbnd) - uint8_t cpl_band_sizes[18]; ///< number of coeffs in each coupling band + uint8_t cpl_band_sizes[AC3_MAX_CPL_BANDS]; ///< number of coeffs in each coupling band int firstchincpl; ///< first channel in coupling int first_cpl_coords[AC3_MAX_CHANNELS]; ///< first coupling coordinates states (firstcplcos) - int cpl_coords[AC3_MAX_CHANNELS][18]; ///< coupling coordinates (cplco) + int cpl_coords[AC3_MAX_CHANNELS][AC3_MAX_CPL_BANDS]; ///< coupling coordinates (cplco) ///@} ///@defgroup spx spectral extension |