From 680b1852ab0326a0756abffa8b8ef8d6c5468ec9 Mon Sep 17 00:00:00 2001 From: Dustin Brody Date: Thu, 4 Aug 2011 22:32:09 -0400 Subject: [PATCH 1/2] aac: propagate error return values for AV_LOG_ERROR-triggering events --- libavcodec/aacdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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); } } From b2700a5c7c073482c763dcb64692d7e0353b60b0 Mon Sep 17 00:00:00 2001 From: Dustin Brody Date: Fri, 5 Aug 2011 20:38:46 -0400 Subject: [PATCH 2/2] lavc: fix misspelling in comment Signed-off-by: Ronald S. Bultje --- libavcodec/avcodec.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index eaf63e8dc1..74a60ae89a 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1440,7 +1440,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.