diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-12-17 14:53:43 +0100 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2015-01-12 23:12:25 +0100 |
| commit | 1411f073fdceeff1f39dbaa035c3c0275f69095f (patch) | |
| tree | dc2e343e507a3d1e6a01fd5d3397cba24273f5cb | |
| parent | 76e9a17f3392e752193015765e9216c2f0716b96 (diff) | |
| download | ffmpeg-1411f073fdceeff1f39dbaa035c3c0275f69095f.tar.gz | |
aacenc: correctly check returned value
CC: libav-stable@libav.org
(cherry picked from commit 971099ff5a85377579eb5b8d3620e283957f097e)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/aacenc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 55aa2f1a2f..a7d144c1c4 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -750,10 +750,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; @@ -765,7 +765,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[2]; |