From 442114c60673ed9dbdae15622329b1cecebbd672 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Mon, 15 Jun 2015 14:19:05 +0200 Subject: [PATCH] videoaggregator: Don't update the ts-offset before updating the actual configured caps --- gst-libs/gst/video/gstvideoaggregator.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c index baacdb5..16ef618 100644 --- a/gst-libs/gst/video/gstvideoaggregator.c +++ b/gst-libs/gst/video/gstvideoaggregator.c @@ -692,14 +692,6 @@ gst_videoaggregator_update_src_caps (GstVideoAggregator * vagg) GstVideoInfo info; int i; - if (GST_VIDEO_INFO_FPS_N (&vagg->info) != best_fps_n || - GST_VIDEO_INFO_FPS_D (&vagg->info) != best_fps_d) { - if (agg->segment.position != -1) { - vagg->priv->ts_offset = agg->segment.position - agg->segment.start; - vagg->priv->nframes = 0; - } - } - /* Initialize the video info with our target format and * the best width and height and framerate. Then copy over * all other fields as we negotiated them before @@ -746,7 +738,6 @@ gst_videoaggregator_update_src_caps (GstVideoAggregator * vagg) if (peercaps) { GstCaps *tmp; - tmp = gst_caps_intersect (caps, peercaps); GST_DEBUG_OBJECT (vagg, "intersecting %" GST_PTR_FORMAT " with peer caps %" GST_PTR_FORMAT " result %" GST_PTR_FORMAT, caps, -- 2.7.4