Credit Kenan Gillet for his contributions towards merging the SoC QCELP decoder.

Originally committed as revision 15839 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/qcelpdata.h b/libavcodec/qcelpdata.h
index c88f34b..3f32275 100644 (file)
--- 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 04b714a..ce4ee84 100644 (file)
--- 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>