X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Faacenc.c;h=635123e46d147ec00b83138dcae1e1475aac9e14;hb=6b0f54ddc746fe2b7939d279837051a427f85b62;hp=d9c72155b13ccaa27ba1c4d13c2910fd41176245;hpb=3d8bedef45a34f099ff85fc1d2b140f6ce88fb85;p=ffmpeg diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index d9c72155b13..635123e46d1 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -753,10 +753,10 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) s->chan_map = aac_chan_configs[s->channels-1]; - if (ret = dsp_init(avctx, s)) + if ((ret = dsp_init(avctx, s)) < 0) goto fail; - if (ret = alloc_buffers(avctx, s)) + if ((ret = alloc_buffers(avctx, s)) < 0) goto fail; avctx->extradata_size = 5; @@ -768,7 +768,8 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) lengths[1] = ff_aac_num_swb_128[i]; for (i = 0; i < s->chan_map[0]; i++) 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; s->psypp = ff_psy_preprocess_init(avctx); s->coder = &ff_aac_coders[s->options.aac_coder];