diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 04:44:39 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 04:45:32 +0100 |
| commit | 5387b0cbfb6eef2d502cc22bc2ab4ed7308ffcac (patch) | |
| tree | 96d80fa8dfea4ce6e0b78ef16f5af894423c6864 /libavcodec | |
| parent | 445ec2dfcbdc448fb9e6c88049d815f663fcb8a2 (diff) | |
| parent | 971099ff5a85377579eb5b8d3620e283957f097e (diff) | |
Merge commit '971099ff5a85377579eb5b8d3620e283957f097e'
* commit '971099ff5a85377579eb5b8d3620e283957f097e':
aacenc: correctly check returned value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 d9c72155b1..635123e46d 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]; |