Author: kostya Date: Thu Jul 31 18:58:19 2008 New Revision: 2959 Log: Model type should belong to enum Modified: aacenc/aacpsy.c aacenc/aacpsy.h Modified: aacenc/aacpsy.c ============================================================================== --- aacenc/aacpsy.c (original) +++ aacenc/aacpsy.c Thu Jul 31 18:58:19 2008 @@ -814,7 +814,7 @@ static const AACPsyModel psy_models[AAC_ }; int av_cold ff_aac_psy_init(AACPsyContext *ctx, AVCodecContext *avctx, - int model, int elements, int flags, + enum AACPsyModelType model, int elements, int flags, const uint8_t *bands1024, int num_bands1024, const uint8_t *bands128, int num_bands128) { Modified: aacenc/aacpsy.h ============================================================================== --- aacenc/aacpsy.h (original) +++ aacenc/aacpsy.h Thu Jul 31 18:58:19 2008 @@ -62,7 +62,7 @@ typedef struct AACPsyModel { }AACPsyModel; int ff_aac_psy_init(AACPsyContext *ctx, AVCodecContext *avctx, - int model, int elements, int flags, + enum AACPsyModelType model, int elements, int flags, const uint8_t *bands1024, int num_bands1024, const uint8_t *bands128, int num_bands128); void ff_aac_psy_suggest_window(AACPsyContext *ctx, int16_t *audio, int16_t *la, int tag, int type, ChannelElement *cpe);