[FFmpeg-cvslog] Merge commit 'a344e5d094ebcf9a23acf3a27c56cbbbc829db42'
Michael Niedermayer
git at videolan.org
Fri Jul 17 23:36:41 CEST 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Fri Jul 17 23:20:14 2015 +0200| [52b6d96268987db14937fcf5f9a53ab9b4184adb] | committer: Michael Niedermayer
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 at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=52b6d96268987db14937fcf5f9a53ab9b4184adb
---
More information about the ffmpeg-cvslog
mailing list