diff --git a/ChangeLog b/ChangeLog
index 51f8e16905..14c7cfa24a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-10-23  Julien MOUTTE  <julien@moutte.net>
+
+	* ext/ffmpeg/Makefile.am: Fix build.
+	* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
+	(gst_ffmpeg_caps_to_codecid), (gst_ffmpeg_get_codecid_longname):
+	* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_register):
+	* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_register): Add QDM2
+	and TrueMotion 2.
+
 2005-10-11  Wim Taymans  <wim@fluendo.com>
 
 	* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_sink_event):
diff --git a/common b/common
index 615cf4d450..1cb5d7b76a 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 615cf4d4506ef1ffb1f600c434fced1fa26b0f44
+Subproject commit 1cb5d7b76a01c711674c752015089e70c394fa99
diff --git a/ext/ffmpeg/Makefile.am b/ext/ffmpeg/Makefile.am
index 0068308e3c..d746d8e366 100644
--- a/ext/ffmpeg/Makefile.am
+++ b/ext/ffmpeg/Makefile.am
@@ -13,10 +13,10 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c 		\
 
 libgstffmpeg_la_CFLAGS = $(GST_CFLAGS) \
 	-I $(top_srcdir)/gst-libs/ext/ffmpeg/libavformat \
+	-I $(top_srcdir)/gst-libs/ext/ffmpeg/libavutil \
 	-I $(top_srcdir)/gst-libs/ext/ffmpeg/libavcodec
 libgstffmpeg_la_LIBADD = \
-	$(top_builddir)/gst-libs/ext/ffmpeg/libavformat/libavformat.la \
-	$(top_builddir)/gst-libs/ext/ffmpeg/libavcodec/libavcodec.la
+	$(top_builddir)/gst-libs/ext/ffmpeg/libavformat/libavformat.la
 
 libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 75ae7b9400..e742b5fd44 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -483,6 +483,9 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
       caps = GST_FF_VID_CAPS_NEW ("video/x-wmv",
           "wmvversion", G_TYPE_INT, 3, NULL);
       break;
+    case CODEC_ID_QDM2:
+      caps = GST_FF_AUD_CAPS_NEW ("audio/x-qdm2", NULL);
+      break;  
 
     case CODEC_ID_WS_VQA:
     case CODEC_ID_IDCIN:
@@ -490,6 +493,7 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
     case CODEC_ID_SMC:
     case CODEC_ID_FLIC:
     case CODEC_ID_TRUEMOTION1:
+    case CODEC_ID_TRUEMOTION2:
     case CODEC_ID_VMDVIDEO:
     case CODEC_ID_VMDAUDIO:
     case CODEC_ID_MSZH:
@@ -1582,6 +1586,9 @@ gst_ffmpeg_caps_to_codecid (const GstCaps * caps, AVCodecContext * context)
   } else if (!strcmp (mimetype, "audio/x-vorbis")) {
     id = CODEC_ID_VORBIS;
     audio = TRUE;
+  } else if (!strcmp (mimetype, "audio/x-qdm2")) {
+    id = CODEC_ID_QDM2;
+    audio = TRUE;
   } else if (!strcmp (mimetype, "audio/mpeg")) {
     gint layer = 0;
     gint mpegversion = 0;
@@ -1943,6 +1950,9 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id)
     case CODEC_ID_VORBIS:
       name = "Vorbis audio";
       break;
+    case CODEC_ID_QDM2:
+      name = "QDesign Music 2";
+      break;
     case CODEC_ID_AC3:
       name = "AC-3 audio";
       break;
@@ -2103,6 +2113,9 @@ gst_ffmpeg_get_codecid_longname (enum CodecID codec_id)
     case CODEC_ID_TRUEMOTION1:
       name = "Duck Truemotion video";
       break;
+    case CODEC_ID_TRUEMOTION2:
+      name = "Duck Truemotion 2 video";
+      break;
     case CODEC_ID_VMDVIDEO:
       name = "Sierra VMD video";
       break;
diff --git a/ext/ffmpeg/gstffmpegdec.c b/ext/ffmpeg/gstffmpegdec.c
index 96f167bce7..5efdbd0b78 100644
--- a/ext/ffmpeg/gstffmpegdec.c
+++ b/ext/ffmpeg/gstffmpegdec.c
@@ -1176,7 +1176,7 @@ gst_ffmpegdec_register (GstPlugin * plugin)
     /* no quasi-codecs, please */
     if (in_plugin->id == CODEC_ID_RAWVIDEO ||
         (in_plugin->id >= CODEC_ID_PCM_S16LE &&
-            in_plugin->id <= CODEC_ID_PCM_U8)) {
+            in_plugin->id <= CODEC_ID_PCM_S24DAUD)) {
       goto next;
     }
 
diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c
index c60ab75872..7824157df2 100644
--- a/ext/ffmpeg/gstffmpegenc.c
+++ b/ext/ffmpeg/gstffmpegenc.c
@@ -733,7 +733,7 @@ gst_ffmpegenc_register (GstPlugin * plugin)
     if (in_plugin->id == CODEC_ID_RAWVIDEO ||
         in_plugin->id == CODEC_ID_ZLIB ||
         (in_plugin->id >= CODEC_ID_PCM_S16LE &&
-            in_plugin->id <= CODEC_ID_PCM_ALAW)) {
+            in_plugin->id <= CODEC_ID_PCM_S24DAUD)) {
       goto next;
     }