Merge commit 'a519583991c38d38503ab08357716513facc5725'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 12:38:51 +0000 (14:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Aug 2013 12:42:34 +0000 (14:42 +0200)
commitdb6b389c7f2176487cc4622a18f58e6b10af8e99
treecaf15aa1b76925c7e152329af6d22c71523c12f4
parent477641e9f8a711b65a463ea75a4167b7cfdc84a5
parenta519583991c38d38503ab08357716513facc5725
Merge commit 'a519583991c38d38503ab08357716513facc5725'

* commit 'a519583991c38d38503ab08357716513facc5725':
  swscale: x86: Hide arch-specific initialization details

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libswscale/rgb2rgb.c
libswscale/swscale.c
libswscale/swscale_internal.h
libswscale/x86/Makefile
libswscale/x86/swscale.c
libswscale/x86/swscale_template.c
libswscale/x86/yuv2rgb.c
libswscale/yuv2rgb.c