# HG changeset patch # User reynaldo # Date 1226797225 0 # Node ID e2c068cb210a09c62b58e84ec207d0d79bcba158 # Parent 4da8fc62ae001a6cf66979e4168e38cc74b79250 Credit Kenan Gillet for his contributions towards merging the SoC QCELP decoder. diff -r 4da8fc62ae00 -r e2c068cb210a qcelpdata.h --- a/qcelpdata.h Sun Nov 16 00:57:06 2008 +0000 +++ b/qcelpdata.h Sun Nov 16 01:00:25 2008 +0000 @@ -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 diff -r 4da8fc62ae00 -r e2c068cb210a qcelpdec.c --- a/qcelpdec.c Sun Nov 16 00:57:06 2008 +0000 +++ b/qcelpdec.c Sun Nov 16 01:00:25 2008 +0000 @@ -23,6 +23,7 @@ * @file qcelpdec.c * QCELP decoder * @author Reynaldo H. Verdejo Pinochet + * @remark FFmpeg merging spearheaded by Kenan Gillet */ #include