diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-17 23:08:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-17 23:08:10 +0100 |
| commit | 0afeb76e75f09be06c58be94365a44d414599d05 (patch) | |
| tree | c0b9062efcbdc2e4d5cedd4a6c457929c103e5dd | |
| parent | 98d4a07ccf97696c6b7e38e6b0e04e8fd5eba9c3 (diff) | |
| parent | 1411f073fdceeff1f39dbaa035c3c0275f69095f (diff) | |
| download | ffmpeg-0afeb76e75f09be06c58be94365a44d414599d05.tar.gz | |
Merge commit '1411f073fdceeff1f39dbaa035c3c0275f69095f' into release/2.4
* commit '1411f073fdceeff1f39dbaa035c3c0275f69095f':
aacenc: correctly check returned value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 0378f0da1a..b3bd9c8610 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -746,10 +746,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; @@ -761,7 +761,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]; |