diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 01:59:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-27 01:59:32 +0100 |
| commit | 62094e2fddf53f608bc42f54ae50979ec8eb2b84 (patch) | |
| tree | 7e0919b560b44a55281d7a1a53a0af580273241f /libavfilter/version.h | |
| parent | 12ab07be447264b107b18bc49bb9e06be072330f (diff) | |
| parent | 9718c31ef60c6aced1fcfab788edb7ca8b6719ee (diff) | |
| download | ffmpeg-62094e2fddf53f608bc42f54ae50979ec8eb2b84.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: add Alias PIX tests
Conflicts:
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/version.h')
0 files changed, 0 insertions, 0 deletions