Commit 5387b0cb authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '971099ff'

* commit '971099ff':
  aacenc: correctly check returned value
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 445ec2df 971099ff
...@@ -753,10 +753,10 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) ...@@ -753,10 +753,10 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
s->chan_map = aac_chan_configs[s->channels-1]; s->chan_map = aac_chan_configs[s->channels-1];
if (ret = dsp_init(avctx, s)) if ((ret = dsp_init(avctx, s)) < 0)
goto fail; goto fail;
if (ret = alloc_buffers(avctx, s)) if ((ret = alloc_buffers(avctx, s)) < 0)
goto fail; goto fail;
avctx->extradata_size = 5; avctx->extradata_size = 5;
...@@ -768,7 +768,8 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) ...@@ -768,7 +768,8 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
lengths[1] = ff_aac_num_swb_128[i]; lengths[1] = ff_aac_num_swb_128[i];
for (i = 0; i < s->chan_map[0]; i++) for (i = 0; i < s->chan_map[0]; i++)
grouping[i] = s->chan_map[i + 1] == TYPE_CPE; grouping[i] = s->chan_map[i + 1] == TYPE_CPE;
if (ret = ff_psy_init(&s->psy, avctx, 2, sizes, lengths, s->chan_map[0], grouping)) if ((ret = ff_psy_init(&s->psy, avctx, 2, sizes, lengths,
s->chan_map[0], grouping)) < 0)
goto fail; goto fail;
s->psypp = ff_psy_preprocess_init(avctx); s->psypp = ff_psy_preprocess_init(avctx);
s->coder = &ff_aac_coders[s->options.aac_coder]; s->coder = &ff_aac_coders[s->options.aac_coder];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment