diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 22:19:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-21 22:20:26 +0100 |
| commit | 977abf9aedec429d9c384058a6e3f39a2969b459 (patch) | |
| tree | 07315b5db4866e918937ee2726a1fa222cd13361 /libavformat/libssh.c | |
| parent | ef25595b71817909344ae1d8efc81e0723cab625 (diff) | |
| parent | 91c981857bc65829ed6cdfd2ddaec396fd9ee372 (diff) | |
| download | ffmpeg-977abf9aedec429d9c384058a6e3f39a2969b459.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rgb2rgb_template: add MMX/SSE2/AVX-optimized deinterleaveBytes
Conflicts:
libswscale/x86/rgb2rgb_template.c
See: 3033cd7555921242cbdc06d0d8aee9f8925d6a3c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/libssh.c')
0 files changed, 0 insertions, 0 deletions