diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-23 22:42:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-23 22:43:08 +0100 |
| commit | d9574069c14a80944ae489b8a08876d123baa428 (patch) | |
| tree | 5b534a22e9f6b9a39f503d1e4cc8670b24e8b20a /libavformat/voc.h | |
| parent | 09824332534990be7d08c5cdcebdcd5926e0a739 (diff) | |
| parent | 1b932eb1508f550fac9e911923a0383efda53aa3 (diff) | |
| download | ffmpeg-streaming-d9574069c14a80944ae489b8a08876d123baa428.zip ffmpeg-streaming-d9574069c14a80944ae489b8a08876d123baa428.tar.gz | |
Merge commit '1b932eb1508f550fac9e911923a0383efda53aa3'
* commit '1b932eb1508f550fac9e911923a0383efda53aa3':
x86: add detection for FMA3 instruction set
Conflicts:
configure
libavutil/cpu.h
libavutil/x86/cpu.c
See: a2af8eddab75f1eac712411e4dde89823c0845e8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/voc.h')
0 files changed, 0 insertions, 0 deletions
