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 /libavformat | |
| parent | ad9e66a56556a3135363121e8e115e4a592a16e2 (diff) | |
| parent | ac9362c5d985ca37d4debb4e0e12497d248ec9d1 (diff) | |
| download | ffmpeg-580a0600efbb374ec2228ff4c0ac44528259cde3.tar.gz | |
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 'libavformat')
| -rw-r--r-- | libavformat/au.c | 4 | ||||
| -rw-r--r-- | libavformat/gif.c | 4 | ||||
| -rw-r--r-- | libavformat/mov.c | 8 | ||||
| -rw-r--r-- | libavformat/nsvdec.c | 3 |
4 files changed, 9 insertions, 10 deletions
diff --git a/libavformat/au.c b/libavformat/au.c index a29e80203b..22004d0c35 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -2,6 +2,8 @@ * AU muxer and demuxer * Copyright (c) 2001 Fabrice Bellard * + * first version by Francois Revol <revol@free.fr> + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -20,8 +22,6 @@ */ /* - * First version by Francois Revol revol@free.fr - * * Reference documents: * http://www.opengroup.org/public/pubs/external/auformat.html * http://www.goice.co.jp/member/mo/formats/au.html diff --git a/libavformat/gif.c b/libavformat/gif.c index 31b01018ad..97ebf1b48e 100644 --- a/libavformat/gif.c +++ b/libavformat/gif.c @@ -2,6 +2,8 @@ * Animated GIF muxer * Copyright (c) 2000 Fabrice Bellard * + * first version by Francois Revol <revol@free.fr> + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -20,8 +22,6 @@ */ /* - * First version by Francois Revol revol@free.fr - * * Features and limitations: * - currently no compression is performed, * in fact the size of the data is 9/8 the size of the image in 8bpp diff --git a/libavformat/mov.c b/libavformat/mov.c index 3c54ef3834..3e48f15e20 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -3,6 +3,9 @@ * Copyright (c) 2001 Fabrice Bellard * Copyright (c) 2009 Baptiste Coudurier <baptiste dot coudurier at gmail dot com> * + * first version by Francois Revol <revol@free.fr> + * seek function by Gael Chardon <gael.dev@4now.net> + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -48,11 +51,6 @@ #include <zlib.h> #endif -/* - * First version by Francois Revol revol@free.fr - * Seek function by Gael Chardon gael.dev@4now.net - */ - #include "qtpalette.h" diff --git a/libavformat/nsvdec.c b/libavformat/nsvdec.c index bcc2180019..e582f0f6cc 100644 --- a/libavformat/nsvdec.c +++ b/libavformat/nsvdec.c @@ -2,6 +2,8 @@ * NSV demuxer * Copyright (c) 2004 The FFmpeg Project * + * first version by Francois Revol <revol@free.fr> + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -37,7 +39,6 @@ #define NSV_MAX_RESYNC_TRIES 300 /* - * First version by Francois Revol - revol@free.fr * References: * (1) http://www.multimedia.cx/nsv-format.txt * seems someone came to the same conclusions as me, and updated it: |