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/adpcmenc.c | |
| 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 'libavcodec/adpcmenc.c')
| -rw-r--r-- | libavcodec/adpcmenc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 762cf673a1..cef8b6f916 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -1,6 +1,10 @@ /* * Copyright (c) 2001-2003 The ffmpeg Project * + * first version by Francois Revol (revol@free.fr) + * fringe ADPCM codecs (e.g., DK3, DK4, Westwood) + * by Mike Melanson (melanson@pcisys.net) + * * This file is part of FFmpeg. * * FFmpeg is free software; you can redistribute it and/or @@ -28,10 +32,6 @@ /** * @file * ADPCM encoders - * First version by Francois Revol (revol@free.fr) - * Fringe ADPCM codecs (e.g., DK3, DK4, Westwood) - * by Mike Melanson (melanson@pcisys.net) - * * See ADPCM decoder reference documents for codec information. */ |