diff --git a/common b/common
index 1de7f6ab2d..6aec6b9716 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 1de7f6ab2d4bc1af69f06079cf0f4e2cbbfdc178
+Subproject commit 6aec6b9716c184c60c4bc6a5916a2471cfa8c8cd
diff --git a/configure.ac b/configure.ac
index d16c139c4c..f90d055501 100644
--- a/configure.ac
+++ b/configure.ac
@@ -441,7 +441,7 @@ AC_SUBST(GST_ALL_LDFLAGS)
 
 dnl this really should only contain flags, not libs - they get added before
 dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
-GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc\$\$' $GST_ALL_LDFLAGS"
+GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc.*' $GST_ALL_LDFLAGS"
 AC_SUBST(GST_PLUGIN_LDFLAGS)
 
 dnl *** output files ***
diff --git a/gst/mpegstream/gstdvddemux.c b/gst/mpegstream/gstdvddemux.c
index 4c53fbfa6f..afe9c1d23a 100644
--- a/gst/mpegstream/gstdvddemux.c
+++ b/gst/mpegstream/gstdvddemux.c
@@ -1200,12 +1200,11 @@ gst_dvd_demux_synchronise_pads (GstMPEGDemux * mpeg_demux,
           ", threshold %" GST_TIME_FORMAT, i,
           GST_TIME_ARGS (dvd_demux->subpicture_stream[i]->cur_ts),
           GST_TIME_ARGS (threshold));
-    }
-    if (dvd_demux->subpicture_stream[i]
-        && (dvd_demux->subpicture_stream[i]->cur_ts < threshold)) {
-      DEMUX_CLASS (mpeg_demux)->sync_stream_to_time (mpeg_demux,
-          dvd_demux->subpicture_stream[i], new_ts);
-      dvd_demux->subpicture_stream[i]->cur_ts = new_ts;
+      if (dvd_demux->subpicture_stream[i]->cur_ts < threshold) {
+        DEMUX_CLASS (mpeg_demux)->sync_stream_to_time (mpeg_demux,
+            dvd_demux->subpicture_stream[i], new_ts);
+        dvd_demux->subpicture_stream[i]->cur_ts = new_ts;
+      }
     }
   }
 }