diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 23:28:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 23:29:05 +0200 |
| commit | 270d3c96ec492e004275fdb7fd625f801fd1a26b (patch) | |
| tree | fd955bf5fb2692736fb7132c02c0b450d06f4e95 /libavresample/audio_mix.h | |
| parent | b3fb2d8cec91dadf935832f3bef97bf5a3a11352 (diff) | |
| parent | e2b0edb6ac9ca2713d8f3846dd0ca265815fa6ea (diff) | |
| download | ffmpeg-270d3c96ec492e004275fdb7fd625f801fd1a26b.tar.gz | |
Merge remote-tracking branch 'ubitux/shorthand-cleanup'
* ubitux/shorthand-cleanup:
lavfi/subtitles: switch to an AVOptions-based system.
lavfi/pp: switch to an AVOptions-based system.
lavfi/geq: switch to an AVOptions-based system.
lavfi/edgedetect: switch to an AVOptions-based system.
lavfi/curves: switch to an AVOptions-based system.
lavfi/colormatrix: switch to an AVOptions-based system.
lavfi/perms: switch to an AVOptions-based system.
lavfi/ebur128: switch to an AVOptions-based system.
lavfi/showspectrum: switch to an AVOptions-based system.
lavfi/silencedetect: switch to an AVOptions-based system.
lavfi/thumbnail: switch to an AVOptions-based system.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/audio_mix.h')
0 files changed, 0 insertions, 0 deletions