From 7412ffbad7c837afb719806a95e8d78b3162258b Mon Sep 17 00:00:00 2001
From: reynaldo <reynaldo@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Date: Sun, 16 Nov 2008 01:00:25 +0000
Subject: [PATCH] To give credit where credit is due.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@15839 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
---
 libavcodec/qcelpdata.h | 1 +
 libavcodec/qcelpdec.c  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/libavcodec/qcelpdata.h b/libavcodec/qcelpdata.h
index c88f34b65..3f3227572 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 04b714aec..ce4ee842d 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>
-- 
2.25.4