diff options
| author | Dustin Brody <libav@parsoma.net> | 2011-08-04 22:32:09 -0400 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2011-08-05 12:35:49 -0700 |
| commit | 680b1852ab0326a0756abffa8b8ef8d6c5468ec9 (patch) | |
| tree | 2189a030ae7d880450251f8cdc0009613f621723 | |
| parent | 6a92551234c6966ab59d00052076b79133e6e7e5 (diff) | |
aac: propagate error return values for AV_LOG_ERROR-triggering events
| -rw-r--r-- | libavcodec/aacdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 783bf99fba..5740d6cd71 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -589,7 +589,9 @@ static av_cold int aac_decode_init(AVCodecContext *avctx) ac->m4ac.chan_config = i; if (ac->m4ac.chan_config) { - set_default_channel_config(avctx, new_che_pos, ac->m4ac.chan_config); + if (set_default_channel_config(avctx, new_che_pos, ac->m4ac.chan_config) < 0 && + avctx->error_recognition >= FF_ER_EXPLODE) + return AVERROR_INVALIDDATA; output_configure(ac, ac->che_pos, new_che_pos, ac->m4ac.chan_config, OC_GLOBAL_HDR); } } |