* commit 'a344e5d094ebcf9a23acf3a27c56cbbbc829db42': x86: bswapdsp: Don't treat 32-bit integers as 64-bit Conflicts: libavcodec/x86/bswapdsp.asm Merged-by: Michael Niedermayer <michael@niedermayer.cc>