diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 18:48:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-10 18:48:07 +0200 |
| commit | 0c3d706bdb2276d39cb4e07784ce58664dbc5485 (patch) | |
| tree | 4903dce3261b05b5851041422b72c4a7bb9e2284 /tests/tiny_ssim.c | |
| parent | d70b4944223831c17a37680bbd9d3caca1c32659 (diff) | |
| parent | b9dfee9fa259dfc885508179a359dccc9e7840bd (diff) | |
| download | ffmpeg-0c3d706bdb2276d39cb4e07784ce58664dbc5485.tar.gz | |
Merge commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd'
* commit 'b9dfee9fa259dfc885508179a359dccc9e7840bd':
vf_fade: switch to an AVOptions-based system.
Conflicts:
doc/filters.texi
libavfilter/vf_fade.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/tiny_ssim.c')
0 files changed, 0 insertions, 0 deletions