Commit 8d0c7031 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '79793f83'

* commit '79793f83':
  Update Fiona's name in copyright statements.
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 581b5f0b 79793f83
/* /*
* VP5/6/8 decoder * 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. * This file is part of FFmpeg.
* *
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Copyright (C) 2010 David Conrad * Copyright (C) 2010 David Conrad
* Copyright (C) 2010 Ronald S. Bultje * Copyright (C) 2010 Ronald S. Bultje
* Copyright (C) 2010 Jason Garrett-Glaser * Copyright (C) 2010 Fiona Glaser
* Copyright (C) 2012 Daniel Kang * Copyright (C) 2012 Daniel Kang
* Copyright (C) 2014 Peter Ross * Copyright (C) 2014 Peter Ross
* *
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* *
* Copyright (C) 2010 David Conrad * Copyright (C) 2010 David Conrad
* Copyright (C) 2010 Ronald S. Bultje * Copyright (C) 2010 Ronald S. Bultje
* Copyright (C) 2010 Jason Garrett-Glaser * Copyright (C) 2010 Fiona Glaser
* Copyright (C) 2012 Daniel Kang * Copyright (C) 2012 Daniel Kang
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
;* SIMD-optimized clear block functions ;* SIMD-optimized clear block functions
;* Copyright (c) 2002 Michael Niedermayer ;* Copyright (c) 2002 Michael Niedermayer
;* Copyright (c) 2008 Loren Merritt ;* Copyright (c) 2008 Loren Merritt
;* Copyright (c) 2009 Jason Garrett-Glaser ;* Copyright (c) 2009 Fiona Glaser
;* ;*
;* This file is part of FFmpeg. ;* This file is part of FFmpeg.
;* ;*
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
;* Copyright (C) 2005-2011 x264 project ;* Copyright (C) 2005-2011 x264 project
;* ;*
;* Authors: Loren Merritt <lorenm@u.washington.edu> ;* Authors: Loren Merritt <lorenm@u.washington.edu>
;* Jason Garrett-Glaser <darkshikari@gmail.com> ;* Fiona Glaser <fiona@x264.com>
;* Oskar Arvidsson <oskar@irock.se> ;* Oskar Arvidsson <oskar@irock.se>
;* ;*
;* This file is part of FFmpeg. ;* This file is part of FFmpeg.
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
;* ;*
;* Authors: Oskar Arvidsson <oskar@irock.se> ;* Authors: Oskar Arvidsson <oskar@irock.se>
;* Loren Merritt <lorenm@u.washington.edu> ;* Loren Merritt <lorenm@u.washington.edu>
;* Jason Garrett-Glaser <darkshikari@gmail.com> ;* Fiona Glaser <fiona@x264.com>
;* ;*
;* This file is part of FFmpeg. ;* This file is part of FFmpeg.
;* ;*
......
;****************************************************************************** ;******************************************************************************
;* H.264 intra prediction asm optimizations ;* 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 Holger Lubitz
;* Copyright (c) 2010 Loren Merritt ;* Copyright (c) 2010 Loren Merritt
;* Copyright (c) 2010 Ronald S. Bultje ;* Copyright (c) 2010 Ronald S. Bultje
......
/* /*
* Copyright (c) 2010 Jason Garrett-Glaser * Copyright (c) 2010 Fiona Glaser <fiona@x264.com>
* *
* This file is part of FFmpeg. * This file is part of FFmpeg.
* *
......
;****************************************************************************** ;******************************************************************************
;* MMX/SSE2-optimized functions for the RV40 decoder ;* MMX/SSE2-optimized functions for the RV40 decoder
;* Copyright (c) 2010 Ronald S. Bultje <rsbultje@gmail.com> ;* 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> ;* Copyright (C) 2012 Christophe Gisquet <christophe.gisquet@gmail.com>
;* ;*
;* This file is part of FFmpeg. ;* This file is part of FFmpeg.
......
;****************************************************************************** ;******************************************************************************
;* VP8 MMXEXT optimizations ;* VP8 MMXEXT optimizations
;* Copyright (c) 2010 Ronald S. Bultje <rsbultje@gmail.com> ;* 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. ;* This file is part of FFmpeg.
;* ;*
......
/* /*
* VP8 DSP functions x86-optimized * VP8 DSP functions x86-optimized
* Copyright (c) 2010 Ronald S. Bultje <rsbultje@gmail.com> * 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. * This file is part of FFmpeg.
* *
......
;****************************************************************************** ;******************************************************************************
;* VP8 MMXEXT optimizations ;* VP8 MMXEXT optimizations
;* Copyright (c) 2010 Ronald S. Bultje <rsbultje@gmail.com> ;* 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. ;* This file is part of FFmpeg.
;* ;*
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
;* ;*
;* Parts based on: ;* Parts based on:
;* H.264 intra prediction asm optimizations ;* 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 Holger Lubitz
;* Copyright (c) 2010 Loren Merritt ;* Copyright (c) 2010 Loren Merritt
;* Copyright (c) 2010 Ronald S. Bultje ;* Copyright (c) 2010 Ronald S. Bultje
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
;* Copyright (C) 2005-2010 x264 project ;* Copyright (C) 2005-2010 x264 project
;* ;*
;* Authors: Loren Merritt <lorenm@u.washington.edu> ;* Authors: Loren Merritt <lorenm@u.washington.edu>
;* Jason Garrett-Glaser <darkshikari@gmail.com> ;* Fiona Glaser <fiona@x264.com>
;* ;*
;* This file is part of FFmpeg. ;* This file is part of FFmpeg.
;* ;*
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
;* ;*
;* Authors: Loren Merritt <lorenm@u.washington.edu> ;* Authors: Loren Merritt <lorenm@u.washington.edu>
;* Anton Mitrofanov <BugMaster@narod.ru> ;* Anton Mitrofanov <BugMaster@narod.ru>
;* Jason Garrett-Glaser <darkshikari@gmail.com> ;* Fiona Glaser <fiona@x264.com>
;* Henrik Gramner <henrik@gramner.com> ;* Henrik Gramner <henrik@gramner.com>
;* ;*
;* Permission to use, copy, modify, and/or distribute this software for any ;* Permission to use, copy, modify, and/or distribute this software for any
......
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