diff --git a/ChangeLog b/ChangeLog
index 615d938a17..46e3aa46a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-08  Edward Hervey  <edward@fluendo.com>
+
+	* ext/ffmpeg/gstffmpegenc.c: (gst_ffmpegenc_me_method_get_type):
+	Make the name of the motion-estimation method enum values meaningful.
+
 2007-01-07  Sébastien Moutte  <sebastien@moutte.net>
 	
 	* Makefile.am:
diff --git a/common b/common
index 64f924f6f2..8ba5dffb5e 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 64f924f6f2ff6275b06facb4c2adbc7c05f70641
+Subproject commit 8ba5dffb5ee7e7daea1030f6b34bfef10f9801a3
diff --git a/ext/ffmpeg/gstffmpegenc.c b/ext/ffmpeg/gstffmpegenc.c
index ed01ca4e3a..2634bb94af 100644
--- a/ext/ffmpeg/gstffmpegenc.c
+++ b/ext/ffmpeg/gstffmpegenc.c
@@ -74,12 +74,12 @@ gst_ffmpegenc_me_method_get_type (void)
 {
   static GType ffmpegenc_me_method_type = 0;
   static GEnumValue ffmpegenc_me_methods[] = {
-    {ME_ZERO, "0", "zero"},
-    {ME_FULL, "1", "full"},
-    {ME_LOG, "2", "logarithmic"},
-    {ME_PHODS, "3", "phods"},
-    {ME_EPZS, "4", "epzs"},
-    {ME_X1, "5", "x1"},
+    {ME_ZERO, "None (Very low quality)", "zero"},
+    {ME_FULL, "Full (Slow, unmaintained)", "full"},
+    {ME_LOG, "Logarithmic (Low quality, unmaintained)", "logarithmic"},
+    {ME_PHODS, "phods (Low quality, unmaintained)", "phods"},
+    {ME_EPZS, "EPZS (Best quality, Fast)", "epzs"},
+    {ME_X1, "X1 (Experimental)", "x1"},
     {0, NULL, NULL},
   };
   if (!ffmpegenc_me_method_type) {