virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2011-08-07 00:32:11 +02:00
parent 4646ef87b1 b2700a5c7c
commit 6c4e9cae52
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/aacdec.c
View File

@@ -591,7 +591,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);
} }
} }

2
libavcodec/avcodec.h
View File

@@ -1487,7 +1487,7 @@ typedef struct AVCodecContext {
float b_quant_offset; 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. * misdetect some more or less valid parts as errors.
* - encoding: unused * - encoding: unused
* - decoding: Set by user. * - decoding: Set by user.