diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-23 22:52:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-23 22:52:58 +0100 |
| commit | bd8d73ea8bb726de2506a292e00200d486fe24ca (patch) | |
| tree | 7e1c2c1ef3c263000687862ff5c2cfa72d4c90ac /libavformat/redspark.c | |
| parent | d9574069c14a80944ae489b8a08876d123baa428 (diff) | |
| parent | d59fcdaff36eb45307a29756c5dd1852034a3f3f (diff) | |
| download | ffmpeg-streaming-bd8d73ea8bb726de2506a292e00200d486fe24ca.zip ffmpeg-streaming-bd8d73ea8bb726de2506a292e00200d486fe24ca.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: add detection for Bit Manipulation Instruction sets
Conflicts:
libavutil/x86/cpu.c
See: 0bc3de19ffe296254f214dc7615e624d8e401bcb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/redspark.c')
0 files changed, 0 insertions, 0 deletions
