diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-23 14:03:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-23 14:03:31 +0100 |
| commit | 7ca97b6b3c9250c77fc5b6f5f9938589e2e18499 (patch) | |
| tree | f33e004fc54c5df16824e39eed4f7c8c7c29e7a7 /libavfilter/Makefile | |
| parent | d28467b62efe3f7824e23a3b54928c05765d33c8 (diff) | |
| parent | 33db40f8d38de03efa0d2a80aa298cf6e1f95093 (diff) | |
| download | ffmpeg-7ca97b6b3c9250c77fc5b6f5f9938589e2e18499.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
configure: sort cpuflags section by architecture
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/Makefile')
0 files changed, 0 insertions, 0 deletions