Merge commit '945673f792eb4141860ed66664156df685f7b7f0'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:52:07 +0000 (00:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 13 Mar 2014 23:52:07 +0000 (00:52 +0100)
* commit '945673f792eb4141860ed66664156df685f7b7f0':
  dsputil_template: K&R formatting cosmetics

Conflicts:
libavcodec/dsputil_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/dsputil_template.c

@@@ -58,8 -62,7 +62,7 @@@ static void FUNCC(draw_edges)(uint8_t *
  }
  #endif
  
- static void FUNCC(get_pixels)(int16_t *av_restrict block,
-                               const uint8_t *_pixels,
 -static void FUNCC(get_pixels)(int16_t *restrict block, const uint8_t *_pixels,
++static void FUNCC(get_pixels)(int16_t *av_restrict block, const uint8_t *_pixels,
                                int line_size)
  {
      const pixel *pixels = (const pixel *) _pixels;