diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:05:14 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:05:14 +0200 |
| commit | 8ac7090c233c0677e59ee5cf7a5817e02c9ec914 (patch) | |
| tree | 005246860921ea00dd9e13077483a8e03a628d12 /libswresample/soxr_resample.c | |
| parent | 72ce979f109f7fcfcb44a0fe12ea025b89b80dfc (diff) | |
| parent | 7668b6832d3c1fd5555be5f4cf6f8e9930dd9c4e (diff) | |
| download | ffmpeg-8ac7090c233c0677e59ee5cf7a5817e02c9ec914.tar.gz | |
Merge remote-tracking branch 'ubitux/shorthand-cleanup'
* ubitux/shorthand-cleanup:
lavfi/idet: switch to an AVOptions-based system.
lavfi/histogram: switch to an AVOptions-based system.
lavfi/stereo3d: switch to an AVOptions-based system.
lavfi/noise: switch to an AVOptions-based system.
lavfi/histeq: switch to an AVOptions-based system.
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/soxr_resample.c')
0 files changed, 0 insertions, 0 deletions