diff --git a/DOCS/tech/codec-devel.txt b/DOCS/tech/codec-devel.txt
index 52968ba65c..0e811d50eb 100644
--- a/DOCS/tech/codec-devel.txt
+++ b/DOCS/tech/codec-devel.txt
@@ -4,6 +4,9 @@ updated to libmpcodecs arch by A'rpi
 
 SEE ALSO: libmpcodecs.txt !!!
 
+NOTE: If you want to implement a new codec, please add it to libavcodec.
+libmpcodecs is considered deprecated.
+
 Introduction
 ------------
 I've developed a number of open source decoders for the MPlayer project,
diff --git a/DOCS/tech/libmpcodecs.txt b/DOCS/tech/libmpcodecs.txt
index 7f649ed4e9..68ad7eeb5a 100644
--- a/DOCS/tech/libmpcodecs.txt
+++ b/DOCS/tech/libmpcodecs.txt
@@ -1,3 +1,6 @@
+NOTE: If you want to implement a new decoder, please add it to libavcodec.
+libmpcodecs is considered deprecated.
+
 The libMPcodecs API details, hints - by A'rpi
 ==================================
 
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c
index 9e0a6cb3b7..7b5ec1d60d 100644
--- a/libmpcodecs/vd.c
+++ b/libmpcodecs/vd.c
@@ -97,6 +97,8 @@ vd_functions_t* mpcodecs_vd_drivers[] = {
 #if defined(USE_QTX_CODECS) || defined(MACOSX)
 	&mpcodecs_vd_qtvideo,
 #endif
+    /* Please do not add any new decoders here. If you want to implement a new
+     * decoder, add it to libavcodec */
 	NULL
 };
 
diff --git a/libmpcodecs/ve.c b/libmpcodecs/ve.c
index c8b1c159a2..34bd63788f 100644
--- a/libmpcodecs/ve.c
+++ b/libmpcodecs/ve.c
@@ -41,6 +41,8 @@ static vf_info_t* encoder_list[]={
 #ifdef HAVE_X264
     &ve_info_x264,
 #endif
+    /* Please do not add any new encoders here. If you want to implement a new
+     * encoder, add it to libavcodec */
     NULL
 };
 
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 8b21f6bc7e..1075c6e5fe 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -141,6 +141,8 @@ const demuxer_desc_t* const demuxer_list[] = {
 #ifdef HAVE_XMMS
   &demuxer_desc_xmms,
 #endif
+  /* Please do not add any new demuxers here. If you want to implement a new
+   * demuxer, add it to libavformat */
   NULL
 };