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_intrapred_init.c | |
| parent | 581b5f0b9b93969712e73e0ae6324bbd03e85d4e (diff) | |
| parent | 79793f833784121d574454af4871866576c0749d (diff) | |
| download | ffmpeg-8d0c7031a846fe27c2a44831e743ee722174fdc0.tar.gz | |
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_intrapred_init.c')
| -rw-r--r-- | libavcodec/x86/h264_intrapred_init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/h264_intrapred_init.c b/libavcodec/x86/h264_intrapred_init.c index 24110eb2e0..528b92e497 100644 --- a/libavcodec/x86/h264_intrapred_init.c +++ b/libavcodec/x86/h264_intrapred_init.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Jason Garrett-Glaser + * Copyright (c) 2010 Fiona Glaser <fiona@x264.com> * * This file is part of FFmpeg. * |