Commit f4f8499c authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'f6633c55'

* commit 'f6633c55':
  avfilter: Fix typo in Loren's email address
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 76424b2d f6633c55
/*
* 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.
*
......
/*
* 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.
*
......
/*
* Copyright (C) 2009 Loren Merritt <lorenm@u.washignton.edu>
* Copyright (C) 2009 Loren Merritt <lorenm@u.washington.edu>
*
* This file is part of FFmpeg.
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment