summaryrefslogtreecommitdiff
path: root/libavcodec/mpegvideo_enc.c
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2008-04-29 14:08:01 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2008-04-29 14:08:01 +0000
commite6dba5dfab1c4a24e1592613a28466770c91dfd5 (patch)
tree62e9dab9406ccdddced14444cd0a6a8793fd2db7 /libavcodec/mpegvideo_enc.c
parent34d71ebe94c6f821b947b25531e528110ca81506 (diff)
Typo: distoration -> distortion.
Originally committed as revision 13019 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo_enc.c')
-rw-r--r--libavcodec/mpegvideo_enc.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
index af6e43b440..8b6aa4330b 100644
--- a/libavcodec/mpegvideo_enc.c
+++ b/libavcodec/mpegvideo_enc.c
@@ -2742,7 +2742,7 @@ static int encode_picture(MpegEncContext *s, int picture_number)
s->me.scene_change_score=0;
-// s->lambda= s->current_picture_ptr->quality; //FIXME qscale / ... stuff for ME ratedistoration
+// s->lambda= s->current_picture_ptr->quality; //FIXME qscale / ... stuff for ME rate distortion
if(s->pict_type==FF_I_TYPE){
if(s->msmpeg4_version >= 3) s->no_rounding=1;
@@ -3078,7 +3078,7 @@ int dct_quantize_trellis_c(MpegEncContext *s,
survivor_count= 1;
for(i=start_i; i<=last_non_zero; i++){
- int level_index, j, zero_distoration;
+ int level_index, j, zero_distortion;
int dct_coeff= FFABS(block[ scantable[i] ]);
int best_score=256*256*256*120;
@@ -3088,10 +3088,10 @@ int dct_quantize_trellis_c(MpegEncContext *s,
#endif
)
dct_coeff= (dct_coeff*inv_aanscales[ scantable[i] ]) >> 12;
- zero_distoration= dct_coeff*dct_coeff;
+ zero_distortion= dct_coeff*dct_coeff;
for(level_index=0; level_index < coeff_count[i]; level_index++){
- int distoration;
+ int distortion;
int level= coeff[level_index][i];
const int alevel= FFABS(level);
int unquant_coeff;
@@ -3112,12 +3112,12 @@ int dct_quantize_trellis_c(MpegEncContext *s,
unquant_coeff<<= 3;
}
- distoration= (unquant_coeff - dct_coeff) * (unquant_coeff - dct_coeff) - zero_distoration;
+ distortion= (unquant_coeff - dct_coeff) * (unquant_coeff - dct_coeff) - zero_distortion;
level+=64;
if((level&(~127)) == 0){
for(j=survivor_count-1; j>=0; j--){
int run= i - survivor[j];
- int score= distoration + length[UNI_AC_ENC_INDEX(run, level)]*lambda;
+ int score= distortion + length[UNI_AC_ENC_INDEX(run, level)]*lambda;
score += score_tab[i-run];
if(score < best_score){
@@ -3130,7 +3130,7 @@ int dct_quantize_trellis_c(MpegEncContext *s,
if(s->out_format == FMT_H263){
for(j=survivor_count-1; j>=0; j--){
int run= i - survivor[j];
- int score= distoration + last_length[UNI_AC_ENC_INDEX(run, level)]*lambda;
+ int score= distortion + last_length[UNI_AC_ENC_INDEX(run, level)]*lambda;
score += score_tab[i-run];
if(score < last_score){
last_score= score;
@@ -3141,10 +3141,10 @@ int dct_quantize_trellis_c(MpegEncContext *s,
}
}
}else{
- distoration += esc_length*lambda;
+ distortion += esc_length*lambda;
for(j=survivor_count-1; j>=0; j--){
int run= i - survivor[j];
- int score= distoration + score_tab[i-run];
+ int score= distortion + score_tab[i-run];
if(score < best_score){
best_score= score;
@@ -3156,7 +3156,7 @@ int dct_quantize_trellis_c(MpegEncContext *s,
if(s->out_format == FMT_H263){
for(j=survivor_count-1; j>=0; j--){
int run= i - survivor[j];
- int score= distoration + score_tab[i-run];
+ int score= distortion + score_tab[i-run];
if(score < last_score){
last_score= score;
last_run= run;