diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 15:37:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-01 15:43:40 +0200 |
| commit | 8d0c7031a846fe27c2a44831e743ee722174fdc0 (patch) | |
| tree | 2cc8d4a4faa166b8e00e1ce563d5e65ae41d9e1a /libavutil/x86 | |
| parent | 581b5f0b9b93969712e73e0ae6324bbd03e85d4e (diff) | |
| parent | 79793f833784121d574454af4871866576c0749d (diff) | |
Merge commit '79793f833784121d574454af4871866576c0749d'
* commit '79793f833784121d574454af4871866576c0749d':
Update Fiona's name in copyright statements.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86')
| -rw-r--r-- | libavutil/x86/cpuid.asm | 2 | ||||
| -rw-r--r-- | libavutil/x86/x86inc.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/x86/cpuid.asm b/libavutil/x86/cpuid.asm index 56876a8708..c3f7866ec7 100644 --- a/libavutil/x86/cpuid.asm +++ b/libavutil/x86/cpuid.asm @@ -2,7 +2,7 @@ ;* Copyright (C) 2005-2010 x264 project ;* ;* Authors: Loren Merritt <lorenm@u.washington.edu> -;* Jason Garrett-Glaser <darkshikari@gmail.com> +;* Fiona Glaser <fiona@x264.com> ;* ;* This file is part of FFmpeg. ;* diff --git a/libavutil/x86/x86inc.asm b/libavutil/x86/x86inc.asm index a7f9f54367..1cfb05509a 100644 --- a/libavutil/x86/x86inc.asm +++ b/libavutil/x86/x86inc.asm @@ -5,7 +5,7 @@ ;* ;* Authors: Loren Merritt <lorenm@u.washington.edu> ;* Anton Mitrofanov <BugMaster@narod.ru> -;* Jason Garrett-Glaser <darkshikari@gmail.com> +;* Fiona Glaser <fiona@x264.com> ;* Henrik Gramner <henrik@gramner.com> ;* ;* Permission to use, copy, modify, and/or distribute this software for any |