Merge commit 'a344e5d094ebcf9a23acf3a27c56cbbbc829db42'
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 21:20:14 +0000 (23:20 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 21:20:14 +0000 (23:20 +0200)
commit52b6d96268987db14937fcf5f9a53ab9b4184adb
tree7077ef6c23ddd678b9f1498e8ffdde3fbbc5dde4
parentc7c33ab721cfafbbe269c8f1505eb2d9a80d7af4
parenta344e5d094ebcf9a23acf3a27c56cbbbc829db42
Merge commit 'a344e5d094ebcf9a23acf3a27c56cbbbc829db42'

* 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>
libavcodec/x86/bswapdsp.asm