Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'

* commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d':
  avfilter: Fix typo in Loren's email address

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --git a/libavfilter/gradfun.h b/libavfilter/gradfun.h
index 7b1140f..eb1f1eb 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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.
  *