diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 23:20:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 23:20:14 +0200 |
| commit | 52b6d96268987db14937fcf5f9a53ab9b4184adb (patch) | |
| tree | 7077ef6c23ddd678b9f1498e8ffdde3fbbc5dde4 /libavcodec/libgsmenc.c | |
| parent | c7c33ab721cfafbbe269c8f1505eb2d9a80d7af4 (diff) | |
| parent | a344e5d094ebcf9a23acf3a27c56cbbbc829db42 (diff) | |
| download | ffmpeg-52b6d96268987db14937fcf5f9a53ab9b4184adb.tar.gz | |
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>
Diffstat (limited to 'libavcodec/libgsmenc.c')
0 files changed, 0 insertions, 0 deletions