Merge commit '49ebe3f9fe02174ae7e14548001fd146ed375cc2'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Oct 2013 09:06:58 +0000 (11:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Oct 2013 09:07:03 +0000 (11:07 +0200)
* commit '49ebe3f9fe02174ae7e14548001fd146ed375cc2':
  x86inc: fix some corner cases of SWAP

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavutil/x86/x86inc.asm

Simple merge