Extradata length checks for Huffyuv.

[ffmpeg] / libavcodec / aacenc.h

diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h
index 458d3d5d998dc0206dda25877c8b874a2538c495..e99be98048df769692389d8043b204214435107d 100644 (file)
--- a/libavcodec/aacenc.h
+++ b/libavcodec/aacenc.h
@@ -32,7 +32,7 @@
 
 struct AACEncContext;
 
-typedef struct AACCoefficientsEncoder{
+typedef struct AACCoefficientsEncoder {
     void (*search_for_quantizers)(AVCodecContext *avctx, struct AACEncContext *s,
                                   SingleChannelElement *sce, const float lambda);
     void (*encode_window_bands_info)(struct AACEncContext *s, SingleChannelElement *sce,
@@ -40,7 +40,7 @@ typedef struct AACCoefficientsEncoder{
     void (*quantize_and_encode_band)(struct AACEncContext *s, PutBitContext *pb, const float *in, int size,
                                      int scale_idx, int cb, const float lambda);
     void (*search_for_ms)(struct AACEncContext *s, ChannelElement *cpe, const float lambda);
-}AACCoefficientsEncoder;
+} AACCoefficientsEncoder;
 
 extern AACCoefficientsEncoder ff_aac_coders[];
 
@@ -49,10 +49,10 @@ extern AACCoefficientsEncoder ff_aac_coders[];
  */
 typedef struct AACEncContext {
     PutBitContext pb;
-    MDCTContext mdct1024;                        ///< long (1024 samples) frame transform context
-    MDCTContext mdct128;                         ///< short (128 samples) frame transform context
+    FFTContext mdct1024;                         ///< long (1024 samples) frame transform context
+    FFTContext mdct128;                          ///< short (128 samples) frame transform context
     DSPContext  dsp;
-    DECLARE_ALIGNED_16(FFTSample, output[2048]); ///< temporary buffer for MDCT input coefficients
+    DECLARE_ALIGNED(16, FFTSample, output)[2048]; ///< temporary buffer for MDCT input coefficients
     int16_t* samples;                            ///< saved preprocessed input
 
     int samplerate_index;                        ///< MPEG-4 samplerate index
@@ -64,8 +64,8 @@ typedef struct AACEncContext {
     int cur_channel;
     int last_frame;
     float lambda;
-    DECLARE_ALIGNED_16(int,   qcoefs[96][2]);    ///< quantized coefficients
-    DECLARE_ALIGNED_16(float, scoefs[1024]);     ///< scaled coefficients
+    DECLARE_ALIGNED(16, int,   qcoefs)[96][2];   ///< quantized coefficients
+    DECLARE_ALIGNED(16, float, scoefs)[1024];    ///< scaled coefficients
 } AACEncContext;
 
 #endif /* AVCODEC_AACENC_H */