Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 13:54:14 +0000 (15:54 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 13:56:03 +0000 (15:56 +0200)
commit01cac26f6848a809aba3f08e45d8c339702d90a9
tree2fd72b6a166536bb9489755b2d8f1eae03fbceae
parentc49b6c3d999c65cbd336a1984306d0c66aa9d2d1
parent1909f6b1b6da2db371c179bed5a19aaf979b7557
Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'

* commit '1909f6b1b6da2db371c179bed5a19aaf979b7557':
  swscale: cosmetics: Drop silly camelCase from swScale function pointer name

Conflicts:
libswscale/swscale_unscaled.c

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