* commit 'acf91215c74a91eb3b86af01dcb1d3c78d0e2310': x86: dsputil: Avoid pointless CONFIG_ENCODERS indirection Conflicts: libavcodec/x86/dsputil_init.c libavcodec/x86/dsputilenc_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>