diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-14 16:13:53 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-14 16:13:57 +0200 |
commit | f9bef2bec9dc594d707a55b7dc3802b0291e109b (patch) | |
tree | 5d67c5ed26ec4a68b9ca3fd1feeb7df83993faf4 /libavformat/voc.c | |
parent | e3e0e3d0c913a55fd616d3c431859564dc0e9b79 (diff) | |
parent | a3fabc6cb389b14f73850033a55567efe725db31 (diff) | |
download | ffmpeg-f9bef2bec9dc594d707a55b7dc3802b0291e109b.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: more AVX2 framework
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/voc.c')
0 files changed, 0 insertions, 0 deletions