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

@@ -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>

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>