diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-05-10 23:16:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-05-10 23:16:09 +0200 |
| commit | 5e1278c6401a5e9aef040dd1f458facba4db7e51 (patch) | |
| tree | 5d2c0dee58d11424a701810b82e8030abcceb029 /libavformat/txd.c | |
| parent | 2a7d71984805d727e9361be4a61132d95c6796b4 (diff) | |
| parent | 2c299d4165cd9653153e12270971c2368551b79e (diff) | |
| download | ffmpeg-5e1278c6401a5e9aef040dd1f458facba4db7e51.tar.gz | |
Merge commit '2c299d4165cd9653153e12270971c2368551b79e'
* commit '2c299d4165cd9653153e12270971c2368551b79e':
x86: sbrdsp: implement SSE2 qmf_pre_shuffle
Conflicts:
libavcodec/x86/sbrdsp.asm
libavcodec/x86/sbrdsp_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/txd.c')
0 files changed, 0 insertions, 0 deletions