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/gif.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/gif.c')
| -rw-r--r-- | libavcodec/gif.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/gif.c b/libavcodec/gif.c index de3e576b3d..98ab767c40 100644 --- a/libavcodec/gif.c +++ b/libavcodec/gif.c @@ -4,6 +4,8 @@ * Copyright (c) 2002 Francois Revol * Copyright (c) 2006 Baptiste Coudurier * + * first version by Francois Revol <revol@free.fr> + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -22,8 +24,6 @@ */ /* - * First version by Francois Revol revol@free.fr - * * Features and limitations: * - uses only a global standard palette * - tested with IE 5.0, Opera for BeOS, NetPositive (BeOS), and Mozilla (BeOS). |