Mercurial > libavcodec.hg
diff h263.c @ 7831:8195c970d077 libavcodec
Rename error_resilience to error_recognition.
author | michael |
---|---|
date | Mon, 08 Sep 2008 18:18:49 +0000 |
parents | 3ec34b551aae |
children | e70975d5ff80 |
line wrap: on
line diff
--- a/h263.c Mon Sep 08 18:18:29 2008 +0000 +++ b/h263.c Mon Sep 08 18:18:49 2008 +0000 @@ -2569,7 +2569,7 @@ }else{ level += pred; ret= level; - if(s->error_resilience>=3){ + if(s->error_recognition>=3){ if(level<0){ av_log(s->avctx, AV_LOG_ERROR, "dc<0 at %dx%d\n", s->mb_x, s->mb_y); return -1; @@ -4588,7 +4588,7 @@ level = get_bits(&s->gb, 8); if((level&0x7F) == 0){ av_log(s->avctx, AV_LOG_ERROR, "illegal dc %d at %d %d\n", level, s->mb_x, s->mb_y); - if(s->error_resilience >= FF_ER_COMPLIANT) + if(s->error_recognition >= FF_ER_COMPLIANT) return -1; } if (level == 255) @@ -4708,7 +4708,7 @@ if (code > 8){ if(get_bits1(&s->gb)==0){ /* marker */ - if(s->error_resilience>=2){ + if(s->error_recognition>=2){ av_log(s->avctx, AV_LOG_ERROR, "dc marker bit missing\n"); return -1; } @@ -4874,7 +4874,7 @@ } #if 0 - if(s->error_resilience >= FF_ER_COMPLIANT){ + if(s->error_recognition >= FF_ER_COMPLIANT){ const int abs_level= FFABS(level); if(abs_level<=MAX_LEVEL && run<=MAX_RUN){ const int run1= run - rl->max_run[last][abs_level] - 1; @@ -4882,7 +4882,7 @@ av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, vlc encoding possible\n"); return -1; } - if(s->error_resilience > FF_ER_COMPLIANT){ + if(s->error_recognition > FF_ER_COMPLIANT){ if(abs_level <= rl->max_level[last][run]*2){ av_log(s->avctx, AV_LOG_ERROR, "illegal 3. esc, esc 1 encoding possible\n"); return -1; @@ -4899,7 +4899,7 @@ else level= level * qmul - qadd; if((unsigned)(level + 2048) > 4095){ - if(s->error_resilience > FF_ER_COMPLIANT){ + if(s->error_recognition > FF_ER_COMPLIANT){ if(level > 2560 || level<-2560){ av_log(s->avctx, AV_LOG_ERROR, "|level| overflow in 3. esc, qp=%d\n", s->qscale); return -1;