Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-23 12:13:38 +02:00
commit f4f8499c19
3 changed files with 3 additions and 3 deletions

View File

@ -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.
*

View File

@ -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.
*

View File

@ -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.
*