| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 10:13:38 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-23 10:14:49 (GMT) |
| commit | f4f8499c19734e1200a9a824734dbc36fba48ce6 (patch) | |
| tree | 905bd0fb8ebb36b04b75efb4033bdfefc1cb4cb0 | |
| parent | 76424b2da8506be50ea95e0b415f154054f0d2d1 (diff) | |
| parent | f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d (diff) | |
| download | ffmpeg-f4f8499c19734e1200a9a824734dbc36fba48ce6.zip ffmpeg-f4f8499c19734e1200a9a824734dbc36fba48ce6.tar.gz ffmpeg-f4f8499c19734e1200a9a824734dbc36fba48ce6.tar.bz2 | |
Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'
* commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d':
avfilter: Fix typo in Loren's email address
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/gradfun.h | 2 | ||||
| -rw-r--r-- | libavfilter/vf_gradfun.c | 2 | ||||
| -rw-r--r-- | libavfilter/x86/vf_gradfun.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/gradfun.h b/libavfilter/gradfun.h index 7b1140f..eb1f1eb 100644 --- a/libavfilter/gradfun.h +++ b/libavfilter/gradfun.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2010 Nolan Lum <nol888@gmail.com> - * Copyright (c) 2009 Loren Merritt <lorenm@u.washignton.edu> + * Copyright (c) 2009 Loren Merritt <lorenm@u.washington.edu> * * This file is part of FFmpeg. * diff --git a/libavfilter/vf_gradfun.c b/libavfilter/vf_gradfun.c index a436fab..802443e 100644 --- a/libavfilter/vf_gradfun.c +++ b/libavfilter/vf_gradfun.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2010 Nolan Lum <nol888@gmail.com> - * Copyright (c) 2009 Loren Merritt <lorenm@u.washignton.edu> + * Copyright (c) 2009 Loren Merritt <lorenm@u.washington.edu> * * This file is part of FFmpeg. * diff --git a/libavfilter/x86/vf_gradfun.c b/libavfilter/x86/vf_gradfun.c index 10accca..ba19229 100644 --- a/libavfilter/x86/vf_gradfun.c +++ b/libavfilter/x86/vf_gradfun.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Loren Merritt <lorenm@u.washignton.edu> + * Copyright (C) 2009 Loren Merritt <lorenm@u.washington.edu> * * This file is part of FFmpeg. * |