diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 13:10:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-12 13:10:53 +0200 |
| commit | 9d47333e3eee1d9a31a98ebf67338463943846dc (patch) | |
| tree | 4e850a0a6195c3f17e2366e3b760c59fbafe1bbe /libavfilter | |
| parent | 50617fce073ca3e360388b38a83341e37db92b80 (diff) | |
| parent | 2b379a925162b6783bd9a81dc03e647e8b65494c (diff) | |
| download | ffmpeg-9d47333e3eee1d9a31a98ebf67338463943846dc.tar.gz | |
Merge commit '2b379a925162b6783bd9a81dc03e647e8b65494c'
* commit '2b379a925162b6783bd9a81dc03e647e8b65494c':
mlpdsp: x86: Respect cpuflags
Conflicts:
libavcodec/x86/mlpdsp.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
0 files changed, 0 insertions, 0 deletions