diff --git a/ChangeLog b/ChangeLog
index c3ccac7c73..0fef8302b0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-12-08  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	* ext/dv/gstdv.c: (plugin_init):
+	* ext/dv/gstdvdec.c: (gst_dvdec_class_init):
+	* ext/dv/gstdvdemux.c: (gst_dvdemux_class_init):
+	Really call dv_init() exactly one time, not one time for
+	the demuxer and one time for the decoder.
+
 2008-12-08  Wim Taymans  <wim.taymans@collabora.co.uk>
 
 	* gst/rtp/gstrtpmp4apay.c: (gst_rtp_mp4a_pay_handle_buffer):
diff --git a/ext/dv/gstdv.c b/ext/dv/gstdv.c
index 7daadfae81..970c5d15b5 100644
--- a/ext/dv/gstdv.c
+++ b/ext/dv/gstdv.c
@@ -28,6 +28,8 @@
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
+  dv_init (0, 0);
+
   if (!gst_element_register (plugin, "dvdemux", GST_RANK_PRIMARY,
           gst_dvdemux_get_type ()))
     return FALSE;
diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c
index 575fe0aba8..958aa51852 100644
--- a/ext/dv/gstdvdec.c
+++ b/ext/dv/gstdvdec.c
@@ -213,9 +213,6 @@ gst_dvdec_class_init (GstDVDecClass * klass)
           1, G_MAXINT, DV_DEFAULT_DECODE_NTH, G_PARAM_READWRITE));
 
   gstelement_class->change_state = gst_dvdec_change_state;
-
-  /* table initialization, only do once */
-  dv_init (0, 0);
 }
 
 static void
diff --git a/ext/dv/gstdvdemux.c b/ext/dv/gstdvdemux.c
index a123b18888..0233c1f6d7 100644
--- a/ext/dv/gstdvdemux.c
+++ b/ext/dv/gstdvdemux.c
@@ -208,9 +208,6 @@ gst_dvdemux_class_init (GstDVDemuxClass * klass)
 
   gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_dvdemux_change_state);
   gstelement_class->send_event = GST_DEBUG_FUNCPTR (gst_dvdemux_send_event);
-
-  /* table initialization, only do once */
-  dv_init (0, 0);
 }
 
 static void