diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 13:23:12 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 13:48:05 +0100 |
commit | 6f1a6a9f6ba0528ac5f77c181b715f9c3fa098e9 (patch) | |
tree | 7cafea337f80f7bdbbba38bf641640fb00acfbae /tests/ref/fate/h264-conformance-mr2_tandberg_e | |
parent | ac1a1fd7088ca903ff3c568612d6a7c2126772a9 (diff) | |
parent | 1a6d4bd7b60761bd7d955011ce7df4dd6b87b497 (diff) | |
download | ffmpeg-6f1a6a9f6ba0528ac5f77c181b715f9c3fa098e9.tar.gz |
Merge commit '1a6d4bd7b60761bd7d955011ce7df4dd6b87b497'
* commit '1a6d4bd7b60761bd7d955011ce7df4dd6b87b497':
FATE: add a test for the fade filter
FATE: add a test for the drawbox filter
FATE: add a test for the boxblur filter
FATE: add a test for the gradfun filter
Conflicts:
tests/fate/filter.mak
tests/ref/fate/filter-gradfun
our gradfun test is renamed to gradfun-ubitux as its name conflicts and
it was requested to be kept. Feel free to rename, change, finetune ...
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/h264-conformance-mr2_tandberg_e')
0 files changed, 0 insertions, 0 deletions