falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

Merge commit '79793f833784121d574454af4871866576c0749d' 

* commit '79793f833784121d574454af4871866576c0749d':
  Update Fiona's name in copyright statements.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.3
Michael Niedermayer 11 years ago
parent
581b5f0b9b 79793f8337
commit
8d0c7031a8
15 changed files with 15 additions and 15 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      libavcodec/vp56rac.c
  2. +1
    -1
      libavcodec/vp8.c
  3. +1
    -1
      libavcodec/vp8.h
  4. +1
    -1
      libavcodec/x86/blockdsp.asm
  5. +1
    -1
      libavcodec/x86/h264_deblock.asm
  6. +1
    -1
      libavcodec/x86/h264_deblock_10bit.asm
  7. +1
    -1
      libavcodec/x86/h264_intrapred.asm
  8. +1
    -1
      libavcodec/x86/h264_intrapred_init.c
  9. +1
    -1
      libavcodec/x86/rv40dsp.asm
  10. +1
    -1
      libavcodec/x86/vp8dsp.asm
  11. +1
    -1
      libavcodec/x86/vp8dsp_init.c
  12. +1
    -1
      libavcodec/x86/vp8dsp_loopfilter.asm
  13. +1
    -1
      libavcodec/x86/vp9intrapred.asm
  14. +1
    -1
      libavutil/x86/cpuid.asm
  15. +1
    -1
      libavutil/x86/x86inc.asm

+ 1
- 1
libavcodec/vp56rac.c View File

@@ -1,6 +1,6 @@
/* /*
* 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.
* *


+ 1
- 1
libavcodec/vp8.c View File

@@ -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
* *


+ 1
- 1
libavcodec/vp8.h View File

@@ -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.


+ 1
- 1
libavcodec/x86/blockdsp.asm View File

@@ -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.
;* ;*


+ 1
- 1
libavcodec/x86/h264_deblock.asm View File

@@ -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.


+ 1
- 1
libavcodec/x86/h264_deblock_10bit.asm View File

@@ -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.
;* ;*


+ 1
- 1
libavcodec/x86/h264_intrapred.asm View File

@@ -1,6 +1,6 @@
;****************************************************************************** ;******************************************************************************
;* 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


+ 1
- 1
libavcodec/x86/h264_intrapred_init.c View File

@@ -1,5 +1,5 @@
/* /*
* 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.
* *


+ 1
- 1
libavcodec/x86/rv40dsp.asm View File

@@ -1,7 +1,7 @@
;****************************************************************************** ;******************************************************************************
;* 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.


+ 1
- 1
libavcodec/x86/vp8dsp.asm View File

@@ -1,7 +1,7 @@
;****************************************************************************** ;******************************************************************************
;* 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.
;* ;*


+ 1
- 1
libavcodec/x86/vp8dsp_init.c View File

@@ -1,7 +1,7 @@
/* /*
* 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.
* *


+ 1
- 1
libavcodec/x86/vp8dsp_loopfilter.asm View File

@@ -1,7 +1,7 @@
;****************************************************************************** ;******************************************************************************
;* 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.
;* ;*


+ 1
- 1
libavcodec/x86/vp9intrapred.asm View File

@@ -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


+ 1
- 1
libavutil/x86/cpuid.asm View File

@@ -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.
;* ;*


+ 1
- 1
libavutil/x86/x86inc.asm View File

@@ -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


Write Preview
Loading…
Cancel
Save