Browse Source

lavc: typo fix cliping -> clipping, saftey -> safety

Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
tags/n3.0
Ganesh Ajjanagadde 9 years ago
parent
commit
b4f1636a4d
2 changed files with 4 additions and 4 deletions
  1. +1
    -1
      libavcodec/acelp_filters.c
  2. +3
    -3
      libavcodec/motion_est.c

+ 1
- 1
libavcodec/acelp_filters.c View File

@@ -70,7 +70,7 @@ void ff_acelp_interpolate(int16_t* out, const int16_t* in,
v += in[n - i] * filter_coeffs[idx - frac_pos];
}
if (av_clip_int16(v >> 15) != (v >> 15))
av_log(NULL, AV_LOG_WARNING, "overflow that would need cliping in ff_acelp_interpolate()\n");
av_log(NULL, AV_LOG_WARNING, "overflow that would need clipping in ff_acelp_interpolate()\n");
out[n] = v >> 15;
}
}


+ 3
- 3
libavcodec/motion_est.c View File

@@ -599,7 +599,7 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift)
int same=1;
const int stride= c->stride;
uint8_t *mv_penalty= c->current_mv_penalty;
int saftey_cliping= s->unrestricted_mv && (s->width&15) && (s->height&15);
int safety_clipping= s->unrestricted_mv && (s->width&15) && (s->height&15);

init_mv4_ref(c);

@@ -611,7 +611,7 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift)
const int mot_stride = s->b8_stride;
const int mot_xy = s->block_index[block];

if(saftey_cliping){
if(safety_clipping){
c->xmax = - 16*s->mb_x + s->width - 8*(block &1);
c->ymax = - 16*s->mb_y + s->height - 8*(block>>1);
}
@@ -643,7 +643,7 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift)
}
P_MV1[0]= mx;
P_MV1[1]= my;
if(saftey_cliping)
if(safety_clipping)
for(i=1; i<10; i++){
if (s->first_slice_line && block<2 && i>1 && i<9)
continue;


Loading…
Cancel
Save