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 /libavcodec/x86/h264_deblock.asm | |
| 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 'libavcodec/x86/h264_deblock.asm')
| -rw-r--r-- | libavcodec/x86/h264_deblock.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm index f3a95a752e..14c8205bab 100644 --- a/libavcodec/x86/h264_deblock.asm +++ b/libavcodec/x86/h264_deblock.asm @@ -4,7 +4,7 @@ ;* Copyright (C) 2005-2011 x264 project ;* ;* Authors: Loren Merritt <lorenm@u.washington.edu> -;* Jason Garrett-Glaser <darkshikari@gmail.com> +;* Fiona Glaser <fiona@x264.com> ;* Oskar Arvidsson <oskar@irock.se> ;* ;* This file is part of FFmpeg. |