summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libavcodec/qcelpdata.h1
-rw-r--r--libavcodec/qcelpdec.c1
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>