Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 13:10:09 +0000 (15:10 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 13:10:09 +0000 (15:10 +0200)
commit5ff1b588eb4e639f0b3cfeff2118aadb2b43584a
tree3a23e041ee9ffa0e5c1f9e73f7c75e4dfae5f623
parent4399e727237316c6491d800b7053dd44322c0ee7
parentc2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19
Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19'

* commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19':
  swscale: ppc: Hide arch-specific initialization details

Conflicts:
libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/ppc/swscale_altivec.c
libswscale/ppc/yuv2rgb_altivec.c
libswscale/ppc/yuv2yuv_altivec.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/swscale_unscaled.c
libswscale/utils.c
libswscale/yuv2rgb.c