diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 22:03:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 22:03:28 +0100 |
| commit | ef25595b71817909344ae1d8efc81e0723cab625 (patch) | |
| tree | 4d4cd22715dc807cdf483cbcd8d0463cf6269fe9 /libavformat/libssh.c | |
| parent | 53feab7a4e99f53fec74f8e8c83f7cc76481eb9a (diff) | |
| parent | 7597e6efe492cb2449bb771054d64cc7fdf62ff5 (diff) | |
| download | ffmpeg-ef25595b71817909344ae1d8efc81e0723cab625.tar.gz | |
Merge commit '7597e6efe492cb2449bb771054d64cc7fdf62ff5'
* commit '7597e6efe492cb2449bb771054d64cc7fdf62ff5':
swscale/x86/rgb2rgb: add support for AVX
Conflicts:
libswscale/x86/rgb2rgb_template.c
See: 4729b529e60fb99356a1d9e13793835af50b3e87
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/libssh.c')
0 files changed, 0 insertions, 0 deletions