Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'd316f9cefcd854071985c6f524a9a15348240264'

Browse Source 
* commit 'd316f9cefcd854071985c6f524a9a15348240264':
  aac: Drop pointless cast

Merged-by: James Almer <jamrial@gmail.com>
pull/258/head
James Almer 8 years ago
parent a4ee955113 d316f9cefc
commit fc2a94219d
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavcodec/aacpsy.c

2
libavcodec/aacpsy.c
Unescape 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) {

Write Preview
Loading…
Cancel
Save