Merge commit 'a5ba798c16d0614d982a76755fdd72b37d437170'

* commit 'a5ba798c16d0614d982a76755fdd72b37d437170':
  dsputil: remove unused functions copy_block{2, 4, 8, 16}.

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/dsputil_template.c
index 2922883,62edd90..7e20995
--- 1/libavcodec/dsputil_template.c
--- 2/libavcodec/dsputil_template.c
+++ b/libavcodec/dsputil_template.c
@@@ -29,60 -29,12 +29,12 @@@
  
  #include "bit_depth_template.c"
  
- static inline void FUNC(copy_block2)(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
- {
-     int i;
-     for(i=0; i<h; i++)
-     {
-         AV_WN2P(dst   , AV_RN2P(src   ));
-         dst+=dstStride;
-         src+=srcStride;
-     }
- }
- 
- static inline void FUNC(copy_block4)(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
- {
-     int i;
-     for(i=0; i<h; i++)
-     {
-         AV_WN4P(dst   , AV_RN4P(src   ));
-         dst+=dstStride;
-         src+=srcStride;
-     }
- }
- 
- static inline void FUNC(copy_block8)(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
- {
-     int i;
-     for(i=0; i<h; i++)
-     {
-         AV_WN4P(dst                , AV_RN4P(src                ));
-         AV_WN4P(dst+4*sizeof(pixel), AV_RN4P(src+4*sizeof(pixel)));
-         dst+=dstStride;
-         src+=srcStride;
-     }
- }
- 
- static inline void FUNC(copy_block16)(uint8_t *dst, const uint8_t *src, int dstStride, int srcStride, int h)
- {
-     int i;
-     for(i=0; i<h; i++)
-     {
-         AV_WN4P(dst                 , AV_RN4P(src                 ));
-         AV_WN4P(dst+ 4*sizeof(pixel), AV_RN4P(src+ 4*sizeof(pixel)));
-         AV_WN4P(dst+ 8*sizeof(pixel), AV_RN4P(src+ 8*sizeof(pixel)));
-         AV_WN4P(dst+12*sizeof(pixel), AV_RN4P(src+12*sizeof(pixel)));
-         dst+=dstStride;
-         src+=srcStride;
-     }
- }
- 
  /* draw the edges of width 'w' of an image of size width, height */
  //FIXME check that this is ok for mpeg4 interlaced
 -static void FUNCC(draw_edges)(uint8_t *_buf, int _wrap, int width, int height, int w, int h, int sides)
 +static void FUNCC(draw_edges)(uint8_t *p_buf, int p_wrap, int width, int height, int w, int h, int sides)
  {
 -    pixel *buf = (pixel*)_buf;
 -    int wrap = _wrap / sizeof(pixel);
 +    pixel *buf = (pixel*)p_buf;
 +    int wrap = p_wrap / sizeof(pixel);
      pixel *ptr, *last_line;
      int i;