diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-09-08 18:18:49 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-08 18:18:49 +0000 |
| commit | 047599a4ba6352b2b5911c10fbec821ef6612d95 (patch) | |
| tree | 5720067dfc00cf9a1a86492c265e17304413bf3b /libavcodec/mpegaudiodec.c | |
| parent | 3e30f46f8b40eb5282e0a529bef9bc95d8eea381 (diff) | |
| download | ffmpeg-047599a4ba6352b2b5911c10fbec821ef6612d95.tar.gz | |
Rename error_resilience to error_recognition.
Originally committed as revision 15270 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegaudiodec.c')
| -rw-r--r-- | libavcodec/mpegaudiodec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c index 34538797fb..ce80217546 100644 --- a/libavcodec/mpegaudiodec.c +++ b/libavcodec/mpegaudiodec.c @@ -327,7 +327,7 @@ static int decode_init(AVCodecContext * avctx) #else avctx->sample_fmt= SAMPLE_FMT_S16; #endif - s->error_resilience= avctx->error_resilience; + s->error_recognition= avctx->error_recognition; if(avctx->antialias_algo != FF_AA_FLOAT) s->compute_antialias= compute_antialias_integer; @@ -1565,7 +1565,7 @@ static int huffman_decode(MPADecodeContext *s, GranuleDef *g, s_index -= 4; skip_bits_long(&s->gb, last_pos - pos); av_log(s->avctx, AV_LOG_INFO, "overread, skip %d enddists: %d %d\n", last_pos - pos, end_pos-pos, end_pos2-pos); - if(s->error_resilience >= FF_ER_COMPLIANT) + if(s->error_recognition >= FF_ER_COMPLIANT) s_index=0; break; } @@ -1602,7 +1602,7 @@ static int huffman_decode(MPADecodeContext *s, GranuleDef *g, if (bits_left < 0/* || bits_left > 500*/) { av_log(s->avctx, AV_LOG_ERROR, "bits_left=%d\n", bits_left); s_index=0; - }else if(bits_left > 0 && s->error_resilience >= FF_ER_AGGRESSIVE){ + }else if(bits_left > 0 && s->error_recognition >= FF_ER_AGGRESSIVE){ av_log(s->avctx, AV_LOG_ERROR, "bits_left=%d\n", bits_left); s_index=0; } |