RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'd316f9cefcd854071985c6f524a9a15348240264' 

* commit 'd316f9cefcd854071985c6f524a9a15348240264':
  aac: Drop pointless cast

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-03-31 16:33:48 -03:00
parent a4ee955113 d316f9cefc
commit fc2a94219d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/aacpsy.c
View File

@ -311,7 +311,7 @@ static av_cold int psy_3gpp_init(FFPsyContext *ctx) {
ctx->model_priv_data = av_mallocz(sizeof(AacPsyContext)); ctx->model_priv_data = av_mallocz(sizeof(AacPsyContext));
if (!ctx->model_priv_data) if (!ctx->model_priv_data)
return AVERROR(ENOMEM); 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; pctx->global_quality = (ctx->avctx->global_quality ? ctx->avctx->global_quality : 120) * 0.01f;
if (ctx->avctx->flags & AV_CODEC_FLAG_QSCALE) { if (ctx->avctx->flags & AV_CODEC_FLAG_QSCALE) {