diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 03:38:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 03:41:08 +0200 |
| commit | 3a3d984445f0e49e692f712ebb51a4b7e6bb006c (patch) | |
| tree | 7c7df400fe0f47c341391639d29b7c0ac89832d7 /libavfilter/vf_drawbox.c | |
| parent | 670e0f7f66207227d70898b07fe0eace767cd027 (diff) | |
| parent | a42d6e6c4c19912b73cae8ca9133b4202667c303 (diff) | |
| download | ffmpeg-3a3d984445f0e49e692f712ebb51a4b7e6bb006c.tar.gz | |
Merge commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303'
* commit 'a42d6e6c4c19912b73cae8ca9133b4202667c303':
vsrc_movie: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/src_movie.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/vf_drawbox.c')
0 files changed, 0 insertions, 0 deletions