Merge commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Mar 2014 20:08:30 +0000 (21:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 20 Mar 2014 20:08:30 +0000 (21:08 +0100)
* commit 'cce791b17becc99f47e097adb93f4b4bbd382e7e':
  hpeldsp_template: Merge some declarations and initializations

Conflicts:
libavcodec/hpeldsp_template.c

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

@@@ -6,20 -6,20 +6,20 @@@
   *
   * gmc & q-pel & 32/64 bit based MC by Michael Niedermayer <michaelni@gmx.at>
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.
   *
 - * Libav is distributed in the hope that it will be useful,
 + * FFmpeg is distributed in the hope that it will be useful,
   * but WITHOUT ANY WARRANTY; without even the implied warranty of
   * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
   * Lesser General Public License for more details.
   *
   * You should have received a copy of the GNU Lesser General Public
 - * License along with Libav; if not, write to the Free Software
 + * License along with FFmpeg; if not, write to the Free Software
   * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
   */
  
@@@ -133,15 -133,15 +133,15 @@@ static inline void FUNCC(OPNAME ## _pix
                                                   ptrdiff_t line_size,   \
                                                   int h)                 \
  {                                                                       \
-     int i, a0, b0, a1, b1;                                              \
      pixel *block        = (pixel *) _block;                             \
      const pixel *pixels = (const pixel *) _pixels;                      \
-     a0  = pixels[0];                                                    \
-     b0  = pixels[1] + 2;                                                \
+     int i, a1, b1;                                                      \
+     int a0 = pixels[0];                                                 \
+     int b0 = pixels[1] + 2;                                             \
+                                                                         \
      a0 += b0;                                                           \
      b0 += pixels[2];                                                    \
-                                                                         \
 -    line_size /= sizeof(pixel);                                         \
 +    line_size >>= sizeof(pixel)-1;                                      \
      pixels += line_size;                                                \
      for (i = 0; i < h; i += 2) {                                        \
          a1  = pixels[0];                                                \