diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:53:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 01:53:08 +0200 |
| commit | 57148122375a8f7aa387bef6b993b936dbb70777 (patch) | |
| tree | 56e9570a593478fedb3887edebd9180f6f9f0111 /doc/Doxyfile | |
| parent | ac217bda30a79177c8a47713b3db12dc9e9bd45b (diff) | |
| parent | f43da3def7645b99d67846fa6d6175b4ece3e9e4 (diff) | |
| download | ffmpeg-57148122375a8f7aa387bef6b993b936dbb70777.tar.gz | |
Merge remote-tracking branch 'mbouron/shorthand-cleanup'
* mbouron/shorthand-cleanup:
lavfi/aphaser: switch to AVOption-based system
lavfi/apad: switch to AVOption-based system
lavfi/afade: switch to AVOption-base system
lavfi/blend: switch to AVOption-based system
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/Doxyfile')
0 files changed, 0 insertions, 0 deletions