
* commit 'a519583991c38d38503ab08357716513facc5725': swscale: x86: Hide arch-specific initialization details Conflicts: libswscale/x86/Makefile libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'a519583991c38d38503ab08357716513facc5725': swscale: x86: Hide arch-specific initialization details Conflicts: libswscale/x86/Makefile libswscale/x86/swscale.c Merged-by: Michael Niedermayer <michaelni@gmx.at>