diff --git a/libavcodec/bit_depth_template.c b/libavcodec/bit_depth_template.c
index d44d47ea45..ca5037148a 100644
--- a/libavcodec/bit_depth_template.c
+++ b/libavcodec/bit_depth_template.c
@@ -30,7 +30,6 @@
 #   undef pixel4
 #   undef dctcoef
 #   undef idctin
-#   undef INIT_CLIP
 #   undef no_rnd_avg_pixel4
 #   undef rnd_avg_pixel4
 #   undef AV_RN2P
@@ -64,7 +63,6 @@
 #   define idctin int16_t
 #endif
 
-#   define INIT_CLIP
 #   define no_rnd_avg_pixel4 no_rnd_avg64
 #   define    rnd_avg_pixel4    rnd_avg64
 #   define AV_RN2P  AV_RN32
@@ -84,7 +82,6 @@
 #   define dctcoef int16_t
 #   define idctin  int16_t
 
-#   define INIT_CLIP
 #   define no_rnd_avg_pixel4 no_rnd_avg32
 #   define    rnd_avg_pixel4    rnd_avg32
 #   define AV_RN2P  AV_RN16
diff --git a/libavcodec/h264pred_template.c b/libavcodec/h264pred_template.c
index b5bc942a5e..98b28d0afb 100644
--- a/libavcodec/h264pred_template.c
+++ b/libavcodec/h264pred_template.c
@@ -414,7 +414,6 @@ static inline void FUNCC(pred16x16_plane_compat)(uint8_t *_src,
 {
   int i, j, k;
   int a;
-  INIT_CLIP
   pixel *src = (pixel*)_src;
   int stride = _stride>>(sizeof(pixel)-1);
   const pixel * const src0 = src +7-stride;
@@ -748,7 +747,6 @@ static void FUNCC(pred8x8_plane)(uint8_t *_src, ptrdiff_t _stride)
 {
   int j, k;
   int a;
-  INIT_CLIP
   pixel *src = (pixel*)_src;
   int stride = _stride>>(sizeof(pixel)-1);
   const pixel * const src0 = src +3-stride;
@@ -784,7 +782,6 @@ static void FUNCC(pred8x16_plane)(uint8_t *_src, ptrdiff_t _stride)
 {
   int j, k;
   int a;
-  INIT_CLIP
   pixel *src = (pixel*)_src;
   int stride = _stride>>(sizeof(pixel)-1);
   const pixel * const src0 = src +3-stride;
diff --git a/libavcodec/h264qpel_template.c b/libavcodec/h264qpel_template.c
index f7fabe4aaa..324a0889e9 100644
--- a/libavcodec/h264qpel_template.c
+++ b/libavcodec/h264qpel_template.c
@@ -78,7 +78,6 @@ static inline void FUNC(copy_block16)(uint8_t *dst, const uint8_t *restrict src,
 static av_unused void FUNC(OPNAME ## h264_qpel2_h_lowpass)(uint8_t *p_dst, const uint8_t *restrict p_src, int dstStride, int srcStride)\
 {\
     const int h=2;\
-    INIT_CLIP\
     int i;\
     pixel *dst = (pixel*)p_dst;\
     const pixel *restrict src = (const pixel*)p_src;\
@@ -96,7 +95,6 @@ static av_unused void FUNC(OPNAME ## h264_qpel2_h_lowpass)(uint8_t *p_dst, const
 static av_unused void FUNC(OPNAME ## h264_qpel2_v_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\
 {\
     const int w=2;\
-    INIT_CLIP\
     int i;\
     pixel *dst = (pixel*)_dst;\
     const pixel *restrict src = (const pixel*)_src;\
@@ -123,7 +121,6 @@ static av_unused void FUNC(OPNAME ## h264_qpel2_hv_lowpass)(uint8_t *_dst, pixel
     const int h=2;\
     const int w=2;\
     const int pad = (BIT_DEPTH == 10) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\
-    INIT_CLIP\
     int i;\
     pixel *dst = (pixel*)_dst;\
     const pixel *restrict src = (const pixel*)_src;\
@@ -156,7 +153,6 @@ static av_unused void FUNC(OPNAME ## h264_qpel2_hv_lowpass)(uint8_t *_dst, pixel
 static void FUNC(OPNAME ## h264_qpel4_h_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\
 {\
     const int h=4;\
-    INIT_CLIP\
     int i;\
     pixel *dst = (pixel*)_dst;\
     const pixel *restrict src = (const pixel*)_src;\
@@ -176,7 +172,6 @@ static void FUNC(OPNAME ## h264_qpel4_h_lowpass)(uint8_t *_dst, const uint8_t *r
 static void FUNC(OPNAME ## h264_qpel4_v_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\
 {\
     const int w=4;\
-    INIT_CLIP\
     int i;\
     pixel *dst = (pixel*)_dst;\
     const pixel *restrict src = (const pixel*)_src;\
@@ -207,7 +202,6 @@ static void FUNC(OPNAME ## h264_qpel4_hv_lowpass)(uint8_t *_dst, pixeltmp *tmp,
     const int h=4;\
     const int w=4;\
     const int pad = (BIT_DEPTH == 10) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\
-    INIT_CLIP\
     int i;\
     pixel *dst = (pixel*)_dst;\
     const pixel *restrict src = (const pixel*)_src;\
@@ -247,7 +241,6 @@ static void FUNC(OPNAME ## h264_qpel4_hv_lowpass)(uint8_t *_dst, pixeltmp *tmp,
 static void FUNC(OPNAME ## h264_qpel8_h_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\
 {\
     const int h=8;\
-    INIT_CLIP\
     int i;\
     pixel *dst = (pixel*)_dst;\
     const pixel *restrict src = (const pixel*)_src;\
@@ -271,7 +264,6 @@ static void FUNC(OPNAME ## h264_qpel8_h_lowpass)(uint8_t *_dst, const uint8_t *r
 static void FUNC(OPNAME ## h264_qpel8_v_lowpass)(uint8_t *_dst, const uint8_t *restrict _src, int dstStride, int srcStride)\
 {\
     const int w=8;\
-    INIT_CLIP\
     int i;\
     pixel *dst = (pixel*)_dst;\
     const pixel *restrict src = (const pixel*)_src;\
@@ -310,7 +302,6 @@ static void FUNC(OPNAME ## h264_qpel8_hv_lowpass)(uint8_t *_dst, pixeltmp *tmp,
     const int h=8;\
     const int w=8;\
     const int pad = (BIT_DEPTH == 10) ? (-10 * ((1<<BIT_DEPTH)-1)) : 0;\
-    INIT_CLIP\
     int i;\
     pixel *dst = (pixel*)_dst;\
     const pixel *restrict src = (const pixel*)_src;\
diff --git a/libavcodec/mips/h264qpel_mmi.c b/libavcodec/mips/h264qpel_mmi.c
index 3482956e13..37ab29a443 100644
--- a/libavcodec/mips/h264qpel_mmi.c
+++ b/libavcodec/mips/h264qpel_mmi.c
@@ -1258,7 +1258,6 @@ static void avg_h264_qpel16_v_lowpass_mmi(uint8_t *dst, const uint8_t *src,
 static void put_h264_qpel4_hv_lowpass_mmi(uint8_t *dst, const uint8_t *src,
         int dstStride, int srcStride)
 {
-    INIT_CLIP
     int i;
     int16_t _tmp[36];
     int16_t *tmp = _tmp;
@@ -1822,7 +1821,6 @@ static void put_pixels16_l2_shift5_mmi(uint8_t *dst, int16_t *src16,
 static void avg_h264_qpel4_hv_lowpass_mmi(uint8_t *dst, const uint8_t *src,
         int dstStride, int srcStride)
 {
-    INIT_CLIP
     int i;
     int16_t _tmp[36];
     int16_t *tmp = _tmp;