aacenc: Deinterleave input samples before processing.

Signed-off-by: Alex Converse <alex.converse@gmail.com>

1 files changed, 5 insertions, 1 deletions

diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h
index 211c70a805..44ab13bf47 100644
--- a/libavcodec/aacenc.h
+++ b/libavcodec/aacenc.h
@@ -58,7 +58,7 @@ typedef struct AACEncContext {
     FFTContext mdct1024;                         ///< long (1024 samples) frame transform context
     FFTContext mdct128;                          ///< short (128 samples) frame transform context
     DSPContext  dsp;
-    float *samples;                              ///< saved preprocessed input
+    float *planar_samples[6];                    ///< saved preprocessed input
 
     int samplerate_index;                        ///< MPEG-4 samplerate index
     int channels;                                ///< channel count
@@ -73,6 +73,10 @@ typedef struct AACEncContext {
     float lambda;
     DECLARE_ALIGNED(16, int,   qcoefs)[96];      ///< quantized coefficients
     DECLARE_ALIGNED(32, float, scoefs)[1024];    ///< scaled coefficients
+
+    struct {
+        float *samples;
+    } buffer;
 } AACEncContext;
 
 extern float ff_aac_pow34sf_tab[428];