OSDN Git Service

Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Nov 2013 11:01:42 +0000 (12:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 23 Nov 2013 11:10:40 +0000 (12:10 +0100)
commit8733b363ac3b2b6e043c3df3d37e4a0258134f4f
tree8eca541026dcf488e722604874933d5a54ec7c52
parent97a0bad87c8d05a3b428e33289efdb18757c47ce
parentc16bfb147df8a9d350e8a0dbc01937b78faf5949
Merge commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949'

* commit 'c16bfb147df8a9d350e8a0dbc01937b78faf5949':
  swscale: x86: Consistently use lowercase function name suffixes

Conflicts:
libswscale/x86/rgb2rgb.c
libswscale/x86/swscale.c

See: 1de064e21e7f1bbdd2347ba8967089a18669fcf8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/x86/swscale.c
libswscale/x86/yuv2rgb.c