diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 12:41:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 12:41:31 +0100 |
| commit | 2b0ff8d6424fa8e5c8dd69e9176be07b40e035ab (patch) | |
| tree | 2822135362bf4bdd0bbe1b2aedd82940425ddb86 /cmdutils_opencl.c | |
| parent | f34cceb1fc58076ac69bef44bf07d8373e58f83d (diff) | |
| parent | 8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9 (diff) | |
| download | ffmpeg-2b0ff8d6424fa8e5c8dd69e9176be07b40e035ab.tar.gz | |
Merge commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9'
* commit '8accddeb5806cd98e3803b4ddf2a2ef576d0e4d9':
vf_frei0r: adjust error messages
Conflicts:
libavfilter/vf_frei0r.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'cmdutils_opencl.c')
0 files changed, 0 insertions, 0 deletions