diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 15:15:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-26 15:15:02 +0100 |
| commit | 59b68ee8870ad7b831321ff39638660ac59e4a18 (patch) | |
| tree | e7d148ab5589e5869ed46914773ba5f140915ba1 /libavcodec/aac.h | |
| parent | a13148f63351db5f8283a23de9a22e940d29d8cd (diff) | |
| parent | 3d3cf6745e2a5dc9c377244454c3186d75b177fa (diff) | |
| download | ffmpeg-59b68ee8870ad7b831321ff39638660ac59e4a18.tar.gz | |
Merge commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa'
* commit '3d3cf6745e2a5dc9c377244454c3186d75b177fa':
aacdec: use float planar sample format for output
Conflicts:
libavcodec/aacdec.c
libavcodec/aacsbr.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aac.h')
| -rw-r--r-- | libavcodec/aac.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/aac.h b/libavcodec/aac.h index 6800067292..9ceccf8909 100644 --- a/libavcodec/aac.h +++ b/libavcodec/aac.h @@ -236,9 +236,10 @@ typedef struct SingleChannelElement { uint8_t zeroes[128]; ///< band is not coded (used by encoder) DECLARE_ALIGNED(32, float, coeffs)[1024]; ///< coefficients for IMDCT DECLARE_ALIGNED(32, float, saved)[1024]; ///< overlap - DECLARE_ALIGNED(32, float, ret)[2048]; ///< PCM output + DECLARE_ALIGNED(32, float, ret_buf)[2048]; ///< PCM output buffer DECLARE_ALIGNED(16, float, ltp_state)[3072]; ///< time signal for LTP PredictorState predictor_state[MAX_PREDICTORS]; + float *ret; ///< PCM output } SingleChannelElement; /** @@ -297,10 +298,10 @@ typedef struct AACContext { /** @} */ /** - * @name Members used for output interleaving + * @name Members used for output * @{ */ - float *output_data[MAX_CHANNELS]; ///< Points to each element's 'ret' buffer (PCM output). + SingleChannelElement *output_element[MAX_CHANNELS]; ///< Points to each SingleChannelElement /** @} */ |