[FFmpeg-soc] [soc]: r3178 - in aacenc: aacpsy.c aacpsy.h

[kostya]

Author: kostya
Date: Tue Aug 12 10:59:25 2008
New Revision: 3178

Log:
Remove unneeded structure members and includes from AAC psychoacoustic model module

Modified:
   aacenc/aacpsy.c
   aacenc/aacpsy.h

Modified: aacenc/aacpsy.c
==============================================================================
--- aacenc/aacpsy.c	(original)
+++ aacenc/aacpsy.c	Tue Aug 12 10:59:25 2008
@@ -25,7 +25,6 @@
  */
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "aacpsy.h"
 
 //borrowed from aac.c
@@ -912,7 +911,6 @@ int av_cold ff_aac_psy_init(AACPsyContex
     ctx->num_bands1024 = num_bands1024;
     ctx->bands128 = bands128;
     ctx->num_bands128 = num_bands128;
-    dsputil_init(&ctx->dsp, avctx);
     ctx->model = &psy_models[model];
 
     if(ctx->flags & PSY_MODEL_NO_ST_ATT || PSY_MODEL_MODE(ctx->flags) == PSY_MODE_QUALITY){

Modified: aacenc/aacpsy.h
==============================================================================
--- aacenc/aacpsy.h	(original)
+++ aacenc/aacpsy.h	Tue Aug 12 10:59:25 2008
@@ -23,7 +23,6 @@
 #define FFMPEG_AACPSY_H
 
 #include "avcodec.h"
-#include "dsputil.h"
 #include "aac.h"
 
 enum AACPsyModelType{
@@ -55,11 +54,8 @@ enum AACPsyModelMode{
  */
 typedef struct AACPsyContext {
     AVCodecContext *avctx;
-    DSPContext dsp;
 
     int flags;
-    int window_type[2];
-    int window_shape[2];
     const uint8_t *bands1024;
     int num_bands1024;
     const uint8_t *bands128;