diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c
index 21d9c7826b..384e0265cc 100644
--- a/gst-libs/gst/video/gstvideodecoder.c
+++ b/gst-libs/gst/video/gstvideodecoder.c
@@ -892,19 +892,18 @@ gst_video_decoder_push_event (GstVideoDecoder * decoder, GstEvent * event)
     {
       GstSegment segment;
 
-      GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-
       gst_event_copy_segment (event, &segment);
 
       GST_DEBUG_OBJECT (decoder, "segment %" GST_SEGMENT_FORMAT, &segment);
 
       if (segment.format != GST_FORMAT_TIME) {
         GST_DEBUG_OBJECT (decoder, "received non TIME newsegment");
-        GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
         break;
       }
 
+      GST_VIDEO_DECODER_STREAM_LOCK (decoder);
       decoder->output_segment = segment;
+      decoder->priv->last_timestamp_out = GST_CLOCK_TIME_NONE;
       GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
       break;
     }
@@ -1122,8 +1121,6 @@ gst_video_decoder_sink_event_default (GstVideoDecoder * decoder,
     {
       GstSegment segment;
 
-      GST_VIDEO_DECODER_STREAM_LOCK (decoder);
-
       gst_event_copy_segment (event, &segment);
 
       if (segment.format == GST_FORMAT_TIME) {
@@ -1153,11 +1150,12 @@ gst_video_decoder_sink_event_default (GstVideoDecoder * decoder,
           gst_event_unref (event);
           event = gst_event_new_segment (&segment);
         } else {
-          GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
           goto newseg_wrong_format;
         }
       }
 
+      GST_VIDEO_DECODER_STREAM_LOCK (decoder);
+
       priv->base_timestamp = GST_CLOCK_TIME_NONE;
       priv->base_picture_number = 0;
 
@@ -1600,9 +1598,11 @@ gst_video_decoder_sink_query_default (GstVideoDecoder * decoder,
       gint64 src_val, dest_val;
 
       gst_query_parse_convert (query, &src_fmt, &src_val, &dest_fmt, &dest_val);
+      GST_VIDEO_DECODER_STREAM_LOCK (decoder);
       res =
           gst_video_encoded_video_convert (priv->bytes_out, priv->time, src_fmt,
           src_val, &dest_fmt, &dest_val);
+      GST_VIDEO_DECODER_STREAM_UNLOCK (decoder);
       if (!res)
         goto error;
       gst_query_set_convert (query, src_fmt, src_val, dest_fmt, dest_val);
diff --git a/gst-libs/gst/video/gstvideodecoder.h b/gst-libs/gst/video/gstvideodecoder.h
index b41ca30b23..04b6245c93 100644
--- a/gst-libs/gst/video/gstvideodecoder.h
+++ b/gst-libs/gst/video/gstvideodecoder.h
@@ -214,7 +214,8 @@ struct _GstVideoDecoder
  * @handle_frame:   Provides input data frame to subclass.
  * @finish:         Optional.
  *                  Called to request subclass to dispatch any pending remaining
- *                  data (e.g. at EOS).
+ *                  data (e.g. at EOS or segment end). Sub-classes should be prepared
+ *                  to handle new data afterward, or seamless segment processing will break.
  * @sink_event:     Optional.
  *                  Event handler on the sink pad. This function should return
  *                  TRUE if the event was handled and should be discarded