Merge commit '0c00fd80ee4791bd70b634084307fc9f179e0412'

[ffmpeg] / libavcodec / psymodel.c

diff --git a/libavcodec/psymodel.c b/libavcodec/psymodel.c
index bdd2509f352b329760d77ab7a1ba91da3202eaf6..cc1da5018a144aff8efc25be2fb4d14ce0971d86 100644 (file)
--- a/libavcodec/psymodel.c
+++ b/libavcodec/psymodel.c
@@ -51,7 +51,7 @@ av_cold int ff_psy_init(FFPsyContext *ctx, AVCodecContext *avctx, int num_lens,
     }
 
     switch (ctx->avctx->codec_id) {
-    case CODEC_ID_AAC:
+    case AV_CODEC_ID_AAC:
         ctx->model = &ff_aac_psy_model;
         break;
     }
@@ -100,7 +100,7 @@ av_cold struct FFPsyPreprocessContext* ff_psy_preprocess_init(AVCodecContext *av
     if (avctx->cutoff > 0)
         cutoff_coeff = 2.0 * avctx->cutoff / avctx->sample_rate;
 
-    if (!cutoff_coeff && avctx->codec_id == CODEC_ID_AAC)
+    if (!cutoff_coeff && avctx->codec_id == AV_CODEC_ID_AAC)
         cutoff_coeff = 2.0 * AAC_CUTOFF(avctx) / avctx->sample_rate;
 
     if (cutoff_coeff)