aac: propagate error return values for AV_LOG_ERROR-triggering events

pull/2/head
Dustin Brody 14 years ago committed by Alex Converse
parent 6a92551234
commit 680b1852ab
  1. 4
      libavcodec/aacdec.c

@ -589,7 +589,9 @@ static av_cold int aac_decode_init(AVCodecContext *avctx)
ac->m4ac.chan_config = i; ac->m4ac.chan_config = i;
if (ac->m4ac.chan_config) { 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); output_configure(ac, ac->che_pos, new_che_pos, ac->m4ac.chan_config, OC_GLOBAL_HDR);
} }
} }

Loading…
Cancel
Save