diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 15:56:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 15:56:18 +0200 |
| commit | 580a0600efbb374ec2228ff4c0ac44528259cde3 (patch) | |
| tree | 60a4c6d8ee228b71c578518a7c53dfda1fbc3a99 /libavcodec/x86/dsputilenc_mmx.c | |
| parent | ad9e66a56556a3135363121e8e115e4a592a16e2 (diff) | |
| parent | ac9362c5d985ca37d4debb4e0e12497d248ec9d1 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Move misplaced file author information where it belongs
Conflicts:
libavcodec/adpcm.c
libavcodec/adpcmenc.c
libavcodec/gif.c
libavcodec/x86/dsputilenc_mmx.c
libavcodec/x86/fmtconvert_init.c
libavformat/au.c
libavformat/gif.c
libavformat/mov.c
libavformat/nsvdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputilenc_mmx.c')
| -rw-r--r-- | libavcodec/x86/dsputilenc_mmx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index a3f268e7a8..06186e2fde 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -3,6 +3,8 @@ * Copyright (c) 2000, 2001 Fabrice Bellard * Copyright (c) 2002-2004 Michael Niedermayer <michaelni@gmx.at> * + * MMX optimization by Nick Kurshev <nickols_k@mail.ru> + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -18,8 +20,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * MMX optimization by Nick Kurshev <nickols_k@mail.ru> */ #include "libavutil/attributes.h" |