aac: propagate error return values for AV_LOG_ERROR-triggering events

680b1852 · Dustin Brody · Alex Converse · 6a925512 · 680b1852
Commit 680b1852 authored Aug 05, 2011 by Dustin Brody Committed by Alex Converse Aug 05, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

aacdec.c libavcodec/aacdec.c +3 -1

No files found.
--- 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);
        }
    }