Merge commit 'f6633c55a3c0e93a5b2bab6aa0692fb608f2a38d'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/39/head
Michael Niedermayer 11 years ago
commit f4f8499c19
  1. 2
      libavfilter/gradfun.h
  2. 2
      libavfilter/vf_gradfun.c
  3. 2
      libavfilter/x86/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.
*

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

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

Loading…
Cancel
Save