diff --git a/gst-libs/gst/video/gstvideodecoder.c b/gst-libs/gst/video/gstvideodecoder.c
index 45bac0fb81..281c420eb7 100644
--- a/gst-libs/gst/video/gstvideodecoder.c
+++ b/gst-libs/gst/video/gstvideodecoder.c
@@ -3038,7 +3038,6 @@ gst_video_decoder_negotiate_default (GstVideoDecoder * decoder)
       events = &decoder->priv->current_frame_events;
     }
 
-    ret = FALSE;
     for (l = g_list_last (*events); l;) {
       GstEvent *event = GST_EVENT (l->data);
       GList *tmp;
diff --git a/gst-libs/gst/video/gstvideoencoder.c b/gst-libs/gst/video/gstvideoencoder.c
index 4405705092..e1365ccf73 100644
--- a/gst-libs/gst/video/gstvideoencoder.c
+++ b/gst-libs/gst/video/gstvideoencoder.c
@@ -1492,7 +1492,6 @@ gst_video_encoder_negotiate_default (GstVideoEncoder * encoder)
       events = &encoder->priv->current_frame_events;
     }
 
-    ret = FALSE;
     for (l = g_list_last (*events); l;) {
       GstEvent *event = GST_EVENT (l->data);
       GList *tmp;
@@ -1511,6 +1510,8 @@ gst_video_encoder_negotiate_default (GstVideoEncoder * encoder)
   prevcaps = gst_pad_get_current_caps (encoder->srcpad);
   if (!prevcaps || !gst_caps_is_equal (prevcaps, state->caps))
     ret = gst_pad_set_caps (encoder->srcpad, state->caps);
+  else
+    ret = TRUE;
   if (prevcaps)
     gst_caps_unref (prevcaps);