pnmenc: switch to encode2().

[ffmpeg] / libavcodec / aacenc.h

diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h
index 067a9b04f34357e1e039e56dd4a72bf47e6e0582..44ab13bf47ba4130126f1c46f1beca6c676b1a93 100644 (file)
--- a/libavcodec/aacenc.h
+++ b/libavcodec/aacenc.h
@@ -58,9 +58,11 @@ typedef struct AACEncContext {
     FFTContext mdct1024;                         ///< long (1024 samples) frame transform context
     FFTContext mdct128;                          ///< short (128 samples) frame transform context
     DSPContext  dsp;
-    int16_t *samples;                            ///< saved preprocessed input
+    float *planar_samples[6];                    ///< saved preprocessed input
 
     int samplerate_index;                        ///< MPEG-4 samplerate index
+    int channels;                                ///< channel count
+    const uint8_t *chan_map;                     ///< channel configuration map
 
     ChannelElement *cpe;                         ///< channel elements
     FFPsyContext psy;
@@ -71,6 +73,12 @@ 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];
+
 #endif /* AVCODEC_AACENC_H */