Merge commit '86157e6db2c7a9222f77fa7e7f50fb9aebc3aa81'

[ffmpeg] / libavcodec / aacpsy.c

diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c
index e32faaa908075a748932321861991ff7af8a224a..fca692cb153f17082e3bcb918841b8e2bbbfe2c4 100644 (file)
--- a/libavcodec/aacpsy.c
+++ b/libavcodec/aacpsy.c
@@ -311,7 +311,7 @@ static av_cold int psy_3gpp_init(FFPsyContext *ctx) {
     ctx->model_priv_data = av_mallocz(sizeof(AacPsyContext));
     if (!ctx->model_priv_data)
         return AVERROR(ENOMEM);
-    pctx = (AacPsyContext*) ctx->model_priv_data;
+    pctx = ctx->model_priv_data;
     pctx->global_quality = (ctx->avctx->global_quality ? ctx->avctx->global_quality : 120) * 0.01f;
 
     if (ctx->avctx->flags & AV_CODEC_FLAG_QSCALE) {