Merge commit '79793f833784121d574454af4871866576c0749d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jul 2014 13:37:21 +0000 (15:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 1 Jul 2014 13:43:40 +0000 (15:43 +0200)
commit8d0c7031a846fe27c2a44831e743ee722174fdc0
tree2cc8d4a4faa166b8e00e1ce563d5e65ae41d9e1a
parent581b5f0b9b93969712e73e0ae6324bbd03e85d4e
parent79793f833784121d574454af4871866576c0749d
Merge commit '79793f833784121d574454af4871866576c0749d'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
15 files changed:
libavcodec/vp56rac.c
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/x86/blockdsp.asm
libavcodec/x86/h264_deblock.asm
libavcodec/x86/h264_deblock_10bit.asm
libavcodec/x86/h264_intrapred.asm
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/rv40dsp.asm
libavcodec/x86/vp8dsp.asm
libavcodec/x86/vp8dsp_init.c
libavcodec/x86/vp8dsp_loopfilter.asm
libavcodec/x86/vp9intrapred.asm
libavutil/x86/cpuid.asm
libavutil/x86/x86inc.asm