diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-09 19:10:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-09 19:10:29 +0200 |
| commit | 5309e7e6aa1e15e52b197930b7a1a2068eb0ac88 (patch) | |
| tree | 4706c3e78a5046f13e80142b1f12cbbc0756e2b6 /libavfilter/af_amix.c | |
| parent | d2f1f2c74f2d40ad21b99302770e356c40162be2 (diff) | |
| parent | f629705b0239c80fddc1b0b15ed4bb9042c77d23 (diff) | |
| download | ffmpeg-5309e7e6aa1e15e52b197930b7a1a2068eb0ac88.tar.gz | |
Merge commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23'
* commit 'f629705b0239c80fddc1b0b15ed4bb9042c77d23':
x86inc: Make INIT_CPUFLAGS support an arbitrary number of cpuflags
See: 428aa14a4851711ea1aa3f9b2d5bac867434993f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/af_amix.c')
0 files changed, 0 insertions, 0 deletions