From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 23 Oct 2013 10:13:38 +0000 (+0200)
Subject: Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'
X-Git-Tag: n2.1~135
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/f4f8499c19734e1200a9a824734dbc36fba48ce6

Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'

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

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

f4f8499c19734e1200a9a824734dbc36fba48ce6
diff --cc libavfilter/gradfun.h
index 7b1140f,f6f7311..eb1f1eb
--- a/libavfilter/gradfun.h
+++ b/libavfilter/gradfun.h
@@@ -1,10 -1,10 +1,10 @@@
  /*
   * 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 Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.
diff --cc libavfilter/vf_gradfun.c
index a436fab,718b7fd..802443e
--- a/libavfilter/vf_gradfun.c
+++ b/libavfilter/vf_gradfun.c
@@@ -1,10 -1,10 +1,10 @@@
  /*
   * 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 Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.
diff --cc libavfilter/x86/vf_gradfun.c
index 10accca,f739047..ba19229
--- a/libavfilter/x86/vf_gradfun.c
+++ b/libavfilter/x86/vf_gradfun.c
@@@ -1,9 -1,9 +1,9 @@@
  /*
-  * Copyright (C) 2009 Loren Merritt <lorenm@u.washignton.edu>
+  * Copyright (C) 2009 Loren Merritt <lorenm@u.washington.edu>
   *
 - * This file is part of Libav.
 + * This file is part of FFmpeg.
   *
 - * Libav is free software; you can redistribute it and/or
 + * FFmpeg is free software; you can redistribute it and/or
   * modify it under the terms of the GNU Lesser General Public
   * License as published by the Free Software Foundation; either
   * version 2.1 of the License, or (at your option) any later version.