Commit b4f1636a authored by Ganesh Ajjanagadde's avatar Ganesh Ajjanagadde

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

Signed-off-by: 's avatarGanesh Ajjanagadde <gajjanagadde@gmail.com>
parent edfc835a
...@@ -70,7 +70,7 @@ void ff_acelp_interpolate(int16_t* out, const int16_t* in, ...@@ -70,7 +70,7 @@ void ff_acelp_interpolate(int16_t* out, const int16_t* in,
v += in[n - i] * filter_coeffs[idx - frac_pos]; v += in[n - i] * filter_coeffs[idx - frac_pos];
} }
if (av_clip_int16(v >> 15) != (v >> 15)) 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; out[n] = v >> 15;
} }
} }
......
...@@ -599,7 +599,7 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift) ...@@ -599,7 +599,7 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift)
int same=1; int same=1;
const int stride= c->stride; const int stride= c->stride;
uint8_t *mv_penalty= c->current_mv_penalty; 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); init_mv4_ref(c);
...@@ -611,7 +611,7 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift) ...@@ -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_stride = s->b8_stride;
const int mot_xy = s->block_index[block]; 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->xmax = - 16*s->mb_x + s->width - 8*(block &1);
c->ymax = - 16*s->mb_y + s->height - 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) ...@@ -643,7 +643,7 @@ static inline int h263_mv4_search(MpegEncContext *s, int mx, int my, int shift)
} }
P_MV1[0]= mx; P_MV1[0]= mx;
P_MV1[1]= my; P_MV1[1]= my;
if(saftey_cliping) if(safety_clipping)
for(i=1; i<10; i++){ for(i=1; i<10; i++){
if (s->first_slice_line && block<2 && i>1 && i<9) if (s->first_slice_line && block<2 && i>1 && i<9)
continue; continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment