diff options
| author | James Almer <jamrial@gmail.com> | 2017-03-31 16:33:48 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-03-31 16:33:48 -0300 |
| commit | fc2a94219df7eccd540e0dac42c27cd9e35148de (patch) | |
| tree | c5220b54cbed688ab604e8e4ace235f2340f4170 /libavcodec | |
| parent | a4ee9551138c8ba7b93c098cacc867d2e9ee95d1 (diff) | |
| parent | d316f9cefcd854071985c6f524a9a15348240264 (diff) | |
| download | ffmpeg-fc2a94219df7eccd540e0dac42c27cd9e35148de.tar.gz | |
Merge commit 'd316f9cefcd854071985c6f524a9a15348240264'
* commit 'd316f9cefcd854071985c6f524a9a15348240264':
aac: Drop pointless cast
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacpsy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index e32faaa908..fca692cb15 100644 --- 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) { |