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 | |
parent | 581b5f0b9b93969712e73e0ae6324bbd03e85d4e (diff) | |
parent | 79793f833784121d574454af4871866576c0749d (diff) | |
download | ffmpeg-streaming-8d0c7031a846fe27c2a44831e743ee722174fdc0.zip ffmpeg-streaming-8d0c7031a846fe27c2a44831e743ee722174fdc0.tar.gz |
Merge commit '79793f833784121d574454af4871866576c0749d'
* commit '79793f833784121d574454af4871866576c0749d':
Update Fiona's name in copyright statements.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r-- | libavcodec/vp56rac.c | 2 | ||||
-rw-r--r-- | libavcodec/vp8.c | 2 | ||||
-rw-r--r-- | libavcodec/vp8.h | 2 | ||||
-rw-r--r-- | libavcodec/x86/blockdsp.asm | 2 | ||||
-rw-r--r-- | libavcodec/x86/h264_deblock.asm | 2 | ||||
-rw-r--r-- | libavcodec/x86/h264_deblock_10bit.asm | 2 | ||||
-rw-r--r-- | libavcodec/x86/h264_intrapred.asm | 2 | ||||
-rw-r--r-- | libavcodec/x86/h264_intrapred_init.c | 2 | ||||
-rw-r--r-- | libavcodec/x86/rv40dsp.asm | 2 | ||||
-rw-r--r-- | libavcodec/x86/vp8dsp.asm | 2 | ||||
-rw-r--r-- | libavcodec/x86/vp8dsp_init.c | 2 | ||||
-rw-r--r-- | libavcodec/x86/vp8dsp_loopfilter.asm | 2 | ||||
-rw-r--r-- | libavcodec/x86/vp9intrapred.asm | 2 | ||||
-rw-r--r-- | libavutil/x86/cpuid.asm | 2 | ||||
-rw-r--r-- | libavutil/x86/x86inc.asm | 2 |
15 files changed, 15 insertions, 15 deletions
diff --git a/libavcodec/vp56rac.c b/libavcodec/vp56rac.c index f11531d..6061b7e 100644 --- a/libavcodec/vp56rac.c +++ b/libavcodec/vp56rac.c @@ -1,6 +1,6 @@ /* * VP5/6/8 decoder - * Copyright (c) 2010 Jason Garrett-Glaser <darkshikari@gmail.com> + * Copyright (c) 2010 Fiona Glaser <fiona@x264.com> * * This file is part of FFmpeg. * diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c index b364743..60accf6 100644 --- a/libavcodec/vp8.c +++ b/libavcodec/vp8.c @@ -3,7 +3,7 @@ * * Copyright (C) 2010 David Conrad * Copyright (C) 2010 Ronald S. Bultje - * Copyright (C) 2010 Jason Garrett-Glaser + * Copyright (C) 2010 Fiona Glaser * Copyright (C) 2012 Daniel Kang * Copyright (C) 2014 Peter Ross * diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h index 534c081..83729c8 100644 --- a/libavcodec/vp8.h +++ b/libavcodec/vp8.h @@ -3,7 +3,7 @@ * * Copyright (C) 2010 David Conrad * Copyright (C) 2010 Ronald S. Bultje - * Copyright (C) 2010 Jason Garrett-Glaser + * Copyright (C) 2010 Fiona Glaser * Copyright (C) 2012 Daniel Kang * * This file is part of FFmpeg. diff --git a/libavcodec/x86/blockdsp.asm b/libavcodec/x86/blockdsp.asm index 6038b48..c793858 100644 --- a/libavcodec/x86/blockdsp.asm +++ b/libavcodec/x86/blockdsp.asm @@ -2,7 +2,7 @@ ;* SIMD-optimized clear block functions ;* Copyright (c) 2002 Michael Niedermayer ;* Copyright (c) 2008 Loren Merritt -;* Copyright (c) 2009 Jason Garrett-Glaser +;* Copyright (c) 2009 Fiona Glaser ;* ;* This file is part of FFmpeg. ;* diff --git a/libavcodec/x86/h264_deblock.asm b/libavcodec/x86/h264_deblock.asm index f3a95a7..14c8205 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. diff --git a/libavcodec/x86/h264_deblock_10bit.asm b/libavcodec/x86/h264_deblock_10bit.asm index fc4f4d7..d8ace17 100644 --- a/libavcodec/x86/h264_deblock_10bit.asm +++ b/libavcodec/x86/h264_deblock_10bit.asm @@ -5,7 +5,7 @@ ;* ;* Authors: Oskar Arvidsson <oskar@irock.se> ;* 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/libavcodec/x86/h264_intrapred.asm b/libavcodec/x86/h264_intrapred.asm index 3e13ccb..88ba597 100644 --- a/libavcodec/x86/h264_intrapred.asm +++ b/libavcodec/x86/h264_intrapred.asm @@ -1,6 +1,6 @@ ;****************************************************************************** ;* H.264 intra prediction asm optimizations -;* Copyright (c) 2010 Jason Garrett-Glaser +;* Copyright (c) 2010 Fiona Glaser ;* Copyright (c) 2010 Holger Lubitz ;* Copyright (c) 2010 Loren Merritt ;* Copyright (c) 2010 Ronald S. Bultje diff --git a/libavcodec/x86/h264_intrapred_init.c b/libavcodec/x86/h264_intrapred_init.c index 24110eb..528b92e 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. * diff --git a/libavcodec/x86/rv40dsp.asm b/libavcodec/x86/rv40dsp.asm index 24a8038..fdd81a0 100644 --- a/libavcodec/x86/rv40dsp.asm +++ b/libavcodec/x86/rv40dsp.asm @@ -1,7 +1,7 @@ ;****************************************************************************** ;* MMX/SSE2-optimized functions for the RV40 decoder ;* Copyright (c) 2010 Ronald S. Bultje <rsbultje@gmail.com> -;* Copyright (c) 2010 Jason Garrett-Glaser <darkshikari@gmail.com> +;* Copyright (c) 2010 Fiona Glaser <fiona@x264.com> ;* Copyright (C) 2012 Christophe Gisquet <christophe.gisquet@gmail.com> ;* ;* This file is part of FFmpeg. diff --git a/libavcodec/x86/vp8dsp.asm b/libavcodec/x86/vp8dsp.asm index 4407dd3..77cc2f3 100644 --- a/libavcodec/x86/vp8dsp.asm +++ b/libavcodec/x86/vp8dsp.asm @@ -1,7 +1,7 @@ ;****************************************************************************** ;* VP8 MMXEXT optimizations ;* Copyright (c) 2010 Ronald S. Bultje <rsbultje@gmail.com> -;* Copyright (c) 2010 Jason Garrett-Glaser <darkshikari@gmail.com> +;* Copyright (c) 2010 Fiona Glaser <fiona@x264.com> ;* ;* This file is part of FFmpeg. ;* diff --git a/libavcodec/x86/vp8dsp_init.c b/libavcodec/x86/vp8dsp_init.c index ff743d6..6668f91 100644 --- a/libavcodec/x86/vp8dsp_init.c +++ b/libavcodec/x86/vp8dsp_init.c @@ -1,7 +1,7 @@ /* * VP8 DSP functions x86-optimized * Copyright (c) 2010 Ronald S. Bultje <rsbultje@gmail.com> - * Copyright (c) 2010 Jason Garrett-Glaser <darkshikari@gmail.com> + * Copyright (c) 2010 Fiona Glaser <fiona@x264.com> * * This file is part of FFmpeg. * diff --git a/libavcodec/x86/vp8dsp_loopfilter.asm b/libavcodec/x86/vp8dsp_loopfilter.asm index 98bd8a5..98bb669 100644 --- a/libavcodec/x86/vp8dsp_loopfilter.asm +++ b/libavcodec/x86/vp8dsp_loopfilter.asm @@ -1,7 +1,7 @@ ;****************************************************************************** ;* VP8 MMXEXT optimizations ;* Copyright (c) 2010 Ronald S. Bultje <rsbultje@gmail.com> -;* Copyright (c) 2010 Jason Garrett-Glaser <darkshikari@gmail.com> +;* Copyright (c) 2010 Fiona Glaser <fiona@x264.com> ;* ;* This file is part of FFmpeg. ;* diff --git a/libavcodec/x86/vp9intrapred.asm b/libavcodec/x86/vp9intrapred.asm index 588d42a..1d8d219 100644 --- a/libavcodec/x86/vp9intrapred.asm +++ b/libavcodec/x86/vp9intrapred.asm @@ -5,7 +5,7 @@ ;* ;* Parts based on: ;* H.264 intra prediction asm optimizations -;* Copyright (c) 2010 Jason Garrett-Glaser +;* Copyright (c) 2010 Fiona Glaser ;* Copyright (c) 2010 Holger Lubitz ;* Copyright (c) 2010 Loren Merritt ;* Copyright (c) 2010 Ronald S. Bultje diff --git a/libavutil/x86/cpuid.asm b/libavutil/x86/cpuid.asm index 56876a8..c3f7866 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 a7f9f54..1cfb055 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 |