mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit '79793f833784121d574454af4871866576c0749d'
* commit '79793f833784121d574454af4871866576c0749d': Update Fiona's name in copyright statements. Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
8d0c7031a8
@ -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.
|
||||
*
|
||||
|
@ -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
|
||||
*
|
||||
|
@ -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.
|
||||
|
@ -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.
|
||||
;*
|
||||
|
@ -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.
|
||||
|
@ -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.
|
||||
;*
|
||||
|
@ -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
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2010 Jason Garrett-Glaser
|
||||
* Copyright (c) 2010 Fiona Glaser <fiona@x264.com>
|
||||
*
|
||||
* This file is part of FFmpeg.
|
||||
*
|
||||
|
@ -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.
|
||||
|
@ -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.
|
||||
;*
|
||||
|
@ -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.
|
||||
*
|
||||
|
@ -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.
|
||||
;*
|
||||
|
@ -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
|
||||
|
@ -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.
|
||||
;*
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user