aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGanesh Ajjanagadde <gajjanagadde@gmail.com>2015-12-11 15:13:49 -0500
committerGanesh Ajjanagadde <gajjanagadde@gmail.com>2015-12-11 19:10:00 -0500
commitb4f1636a4d7787eccf022ce2433cd9ce53e407cc (patch)
tree6ce83e1ec6b0c117b46201b0510bbb9edb9fd4d0
parentedfc835a56a51bccd8aa7a6867f6a8c93f3c6224 (diff)
downloadffmpeg-b4f1636a4d7787eccf022ce2433cd9ce53e407cc.tar.gz
lavc: typo fix cliping -> clipping, saftey -> safety
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
-rw-r--r--libavcodec/acelp_filters.c2
-rw-r--r--libavcodec/motion_est.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/acelp_filters.c b/libavcodec/acelp_filters.c
index 9ab758b977..35aa863e7a 100644
--- a/libavcodec/acelp_filters.c
+++ b/libavcodec/acelp_filters.c
@@ -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;
}
}
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 9f71568efd..6a17921d81 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -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;