diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 15:27:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 15:37:21 +0200 |
| commit | 43bac121d3de0076e76e6f8438934d53f2707ce2 (patch) | |
| tree | 30b2ed942e6a8790baf2ba26e7153a33d6704986 /doc/git-howto.txt | |
| parent | 2a2a643c90ff091f1fa4a0634bcc4e18639bcee0 (diff) | |
| parent | 62dcdb028cc84845fd263bb09304c4c6500bda7a (diff) | |
| download | ffmpeg-43bac121d3de0076e76e6f8438934d53f2707ce2.tar.gz | |
Merge commit '62dcdb028cc84845fd263bb09304c4c6500bda7a'
* commit '62dcdb028cc84845fd263bb09304c4c6500bda7a':
vf_blackframe: switch to an AVOptions-based system.
vf_aspect: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_aspect.c
libavfilter/vf_blackframe.c
In the aspect filter most changes are merged but not the final
switch to the libav API because that is too restrictive and has
difficulty handling the syntax.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/git-howto.txt')
0 files changed, 0 insertions, 0 deletions