diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c
index c5ca585a01..8ddc0a00f4 100644
--- a/ext/mad/gstmad.c
+++ b/ext/mad/gstmad.c
@@ -338,7 +338,7 @@ gst_mad_convert_src (GstPad *pad, GstFormat src_format, gint64 src_value,
   switch (src_format) {
     case GST_FORMAT_BYTES:
       switch (*dest_format) {
-        case GST_FORMAT_SAMPLES:
+        case GST_FORMAT_UNIT:
 	  if (bytes_per_sample == 0)
             return FALSE;
 	  *dest_value = src_value / bytes_per_sample;
@@ -358,7 +358,7 @@ gst_mad_convert_src (GstPad *pad, GstFormat src_format, gint64 src_value,
           res = FALSE;
       }
       break;
-    case GST_FORMAT_SAMPLES:
+    case GST_FORMAT_UNIT:
       switch (*dest_format) {
         case GST_FORMAT_BYTES:
 	  *dest_value = src_value * bytes_per_sample;
@@ -381,7 +381,7 @@ gst_mad_convert_src (GstPad *pad, GstFormat src_format, gint64 src_value,
         case GST_FORMAT_BYTES:
 	  scale = bytes_per_sample;
 	  /* fallthrough */
-        case GST_FORMAT_SAMPLES:
+        case GST_FORMAT_UNIT:
 	  *dest_value = src_value * scale * mad->frame.header.samplerate / GST_SECOND;
           break;
         default:
@@ -413,7 +413,7 @@ gst_mad_src_query (GstPad *pad, GstPadQueryType type,
           *format = GST_FORMAT_TIME;
 	  /* fallthrough */
 	case GST_FORMAT_BYTES:
-	case GST_FORMAT_SAMPLES:
+	case GST_FORMAT_UNIT:
 	case GST_FORMAT_TIME:
         {
 	  res = FALSE;
@@ -457,13 +457,13 @@ gst_mad_src_query (GstPad *pad, GstPadQueryType type,
           GstFormat time_format;
 	  gint64 samples;
 
-          time_format = GST_FORMAT_SAMPLES;
+          time_format = GST_FORMAT_UNIT;
 	  res = gst_mad_convert_src (pad,
 			GST_FORMAT_TIME, mad->base_time,
 			&time_format, &samples);
 	  /* we only know about our samples, convert to requested format */
 	  res &= gst_mad_convert_src (pad,
-			  GST_FORMAT_SAMPLES, mad->total_samples + samples,
+			  GST_FORMAT_UNIT, mad->total_samples + samples,
 			  format, value);
 	  break;
 	}
diff --git a/ext/mpeg2dec/gstmpeg2dec.c b/ext/mpeg2dec/gstmpeg2dec.c
index d5cf77aa16..3323c3f50a 100644
--- a/ext/mpeg2dec/gstmpeg2dec.c
+++ b/ext/mpeg2dec/gstmpeg2dec.c
@@ -217,7 +217,6 @@ gst_mpeg2dec_vo_frame_draw (vo_frame_t * frame)
 
   GST_BUFFER_TIMESTAMP (_frame->buffer) = pts;
 
-  /* g_print ("out: %lld\n", GST_BUFFER_TIMESTAMP (_frame->buffer)); */
   GST_DEBUG (0, "out: %lld %d %lld", GST_BUFFER_TIMESTAMP (_frame->buffer),
 		  mpeg2dec->decoder->frame_rate_code,
                   (long long)(GST_SECOND / video_rates[mpeg2dec->decoder->frame_rate_code]));
@@ -444,12 +443,12 @@ gst_mpeg2dec_chain (GstPad *pad, GstBuffer *buf)
   if (GST_IS_EVENT (buf)) {
     GstEvent *event = GST_EVENT (buf);
 
-    switch (event->type) {
+    switch (GST_EVENT_TYPE (event)) {
       case GST_EVENT_DISCONTINUOUS:
       {
 	//gint64 value = GST_EVENT_DISCONT_OFFSET (event, 0).value;
 	//mpeg2dec->decoder->is_sequence_needed = 1;
-	/* g_print ("mpeg2dec: discont %lld\n", value); */
+	GST_DEBUG (GST_CAT_EVENT, "mpeg2dec: discont\n"); 
         mpeg2dec->first = TRUE;
         mpeg2dec->frames_per_PTS = 0;
         mpeg2dec->last_PTS = -1;
@@ -508,11 +507,18 @@ gst_mpeg2dec_chain (GstPad *pad, GstBuffer *buf)
   if (mpeg2dec->next_time < pts) {
     mpeg2dec->next_time = pts;
   }
+  /*
+  if (mpeg2dec->last_PTS < pts) {
+    mpeg2dec->next_time = pts;
+    g_print ("** adjust next_time %lld %lld\n", mpeg2dec->last_PTS, pts);
+  }
+  */
+	    
   mpeg2dec->last_PTS = pts;
 
 
-/*fprintf(stderr, "MPEG2DEC: in timestamp=%llu\n",GST_BUFFER_TIMESTAMP(buf));*/
-/*fprintf(stderr, "MPEG2DEC: have buffer of %d bytes\n",size);		*/
+/* fprintf(stderr, "MPEG2DEC: in timestamp=%llu\n",GST_BUFFER_TIMESTAMP(buf)); */
+/* fprintf(stderr, "MPEG2DEC: have buffer of %d bytes\n",size);		*/
   num_frames = mpeg2_decode_data(mpeg2dec->decoder, data, data + size);
 /*fprintf(stderr, "MPEG2DEC: decoded %d frames\n", num_frames);*/
 
@@ -588,16 +594,14 @@ gst_mpeg2dec_convert_src (GstPad *pad, GstFormat src_format, gint64 src_value,
 	  *dest_value = src_value * 6 * (mpeg2dec->width * mpeg2dec->height >> 2) *  
 		  video_rates[mpeg2dec->decoder->frame_rate_code] / GST_SECOND;
 	  break;
-        case GST_FORMAT_FRAMES:
-        case GST_FORMAT_FIELDS:
+        case GST_FORMAT_UNIT:
 	  *dest_value = src_value * video_rates[mpeg2dec->decoder->frame_rate_code] / GST_SECOND;
 	  break;
         default:
           res = FALSE;
       }
       break;
-    case GST_FORMAT_FRAMES:
-    case GST_FORMAT_FIELDS:
+    case GST_FORMAT_UNIT:
       switch (*dest_format) {
         case GST_FORMAT_DEFAULT:
           *dest_format = GST_FORMAT_TIME;
@@ -612,8 +616,7 @@ gst_mpeg2dec_convert_src (GstPad *pad, GstFormat src_format, gint64 src_value,
         case GST_FORMAT_BYTES:
 	  *dest_value = src_value * 6 * (mpeg2dec->width * mpeg2dec->height >> 2);
 	  break;
-        case GST_FORMAT_FRAMES:
-        case GST_FORMAT_FIELDS:
+        case GST_FORMAT_UNIT:
 	  *dest_value = src_value;
 	  break;
         default:
@@ -647,8 +650,7 @@ gst_mpeg2dec_src_query (GstPad *pad, GstPadQueryType type,
           /* fallthrough */
         case GST_FORMAT_TIME:
         case GST_FORMAT_BYTES:
-        case GST_FORMAT_FRAMES:
-        case GST_FORMAT_FIELDS:
+        case GST_FORMAT_UNIT:
 	{
           res = FALSE;