diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 12:16:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 12:16:05 +0100 |
| commit | f67e75b5dc048adcde38567f4b6cfeaaf0676bbd (patch) | |
| tree | 4d30be05e489d1da98879df4d5fc063dea91658c /tests/ref | |
| parent | 35e63f35b0e34a006fc2d2ce99fae8d1d314b322 (diff) | |
| parent | 227cfc1f10a940c88ad3742ec805c07b6a5e7abb (diff) | |
| download | ffmpeg-f67e75b5dc048adcde38567f4b6cfeaaf0676bbd.tar.gz | |
Merge commit '227cfc1f10a940c88ad3742ec805c07b6a5e7abb' into release/2.2
* commit '227cfc1f10a940c88ad3742ec805c07b6a5e7abb':
vf_frei0r: adjust error messages
Conflicts:
libavfilter/vf_frei0r.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref')
0 files changed, 0 insertions, 0 deletions