diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-07 00:32:11 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-07 00:32:19 +0200 |
| commit | 6c4e9cae5223c88ad98cd184d4a7e6a019bdd586 (patch) | |
| tree | 3c8e34592fb6a6dbd905b1930e5722569fa1febf /libavcodec | |
| parent | 4646ef87b1f55ab07a59e1f282d75c9b03747798 (diff) | |
| parent | b2700a5c7c073482c763dcb64692d7e0353b60b0 (diff) | |
| download | ffmpeg-6c4e9cae5223c88ad98cd184d4a7e6a019bdd586.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: fix misspelling in comment
aac: propagate error return values for AV_LOG_ERROR-triggering events
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacdec.c | 4 | ||||
| -rw-r--r-- | libavcodec/avcodec.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 927d4314fa..7589bd7e7b 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -591,7 +591,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); } } diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 2a438ccc13..b2a8e4c33e 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1487,7 +1487,7 @@ typedef struct AVCodecContext { float b_quant_offset; /** - * Error recognization; higher values will detect more errors but may + * Error recognition; higher values will detect more errors but may * misdetect some more or less valid parts as errors. * - encoding: unused * - decoding: Set by user. |