diff options
| author | Reynaldo H. Verdejo Pinochet <reynaldo@opendot.cl> | 2008-11-16 01:00:25 +0000 |
|---|---|---|
| committer | Reynaldo H. Verdejo Pinochet <reynaldo@opendot.cl> | 2008-11-16 01:00:25 +0000 |
| commit | 8e36385a63ee0311130266f8fd23fc5e375d50ce (patch) | |
| tree | de89c7c8f41b3cdd502c17e9bb73ffe795559bbd /libavcodec | |
| parent | 1c3ae1abf2f415c628e546550c767777454f3681 (diff) | |
| download | ffmpeg-8e36385a63ee0311130266f8fd23fc5e375d50ce.tar.gz | |
Credit Kenan Gillet for his contributions towards merging the SoC QCELP decoder.
Originally committed as revision 15839 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/qcelpdata.h | 1 | ||||
| -rw-r--r-- | libavcodec/qcelpdec.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/qcelpdata.h b/libavcodec/qcelpdata.h index c88f34b655..3f3227572b 100644 --- a/libavcodec/qcelpdata.h +++ b/libavcodec/qcelpdata.h @@ -26,6 +26,7 @@ * @file qcelpdata.h * Data tables for the QCELP decoder * @author Reynaldo H. Verdejo Pinochet + * @remark FFmpeg merging spearheaded by Kenan Gillet */ #include <stdint.h> diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c index 04b714aec2..ce4ee842d1 100644 --- a/libavcodec/qcelpdec.c +++ b/libavcodec/qcelpdec.c @@ -23,6 +23,7 @@ * @file qcelpdec.c * QCELP decoder * @author Reynaldo H. Verdejo Pinochet + * @remark FFmpeg merging spearheaded by Kenan Gillet */ #include <stddef.h> |