From 8e36385a63ee0311130266f8fd23fc5e375d50ce Mon Sep 17 00:00:00 2001
From: "Reynaldo H. Verdejo Pinochet" <reynaldo@opendot.cl>
Date: Sun, 16 Nov 2008 01:00:25 +0000
Subject: [PATCH] Credit Kenan Gillet for his contributions towards merging the
 SoC QCELP decoder.

Originally committed as revision 15839 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/qcelpdata.h | 1 +
 libavcodec/qcelpdec.c  | 1 +
 2 files changed, 2 insertions(+)

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>