Merge commit '7597e6efe492cb2449bb771054d64cc7fdf62ff5'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 21:03:28 +0000 (22:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 21:03:28 +0000 (22:03 +0100)
commitef25595b71817909344ae1d8efc81e0723cab625
tree4d4cd22715dc807cdf483cbcd8d0463cf6269fe9
parent53feab7a4e99f53fec74f8e8c83f7cc76481eb9a
parent7597e6efe492cb2449bb771054d64cc7fdf62ff5
Merge commit '7597e6efe492cb2449bb771054d64cc7fdf62ff5'

* commit '7597e6efe492cb2449bb771054d64cc7fdf62ff5':
  swscale/x86/rgb2rgb: add support for AVX

Conflicts:
libswscale/x86/rgb2rgb_template.c

See: 4729b529e60fb99356a1d9e13793835af50b3e87
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/x86/rgb2rgb_template.c