diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 03:10:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 03:10:43 +0200 |
| commit | 8bafd83aaafad42e64acfe3646e5b4b3597982fd (patch) | |
| tree | ca2cfec73b00ad3412b8fb042035213c0afb6255 /tests/fate/qt.mak | |
| parent | 7f2198a2f1cf24c8df6709058f9e6f3d69c44f7a (diff) | |
| parent | 7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe (diff) | |
| download | ffmpeg-8bafd83aaafad42e64acfe3646e5b4b3597982fd.tar.gz | |
Merge commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe'
* commit '7bc1a883c9158bb6e383d86fc76bdf2541e9a9fe':
vsrc_color: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vsrc_color.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/fate/qt.mak')
0 files changed, 0 insertions, 0 deletions