diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2015-06-15 14:19:05 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-06-15 14:19:05 +0200 |
| commit | 442114c60673ed9dbdae15622329b1cecebbd672 (patch) | |
| tree | a796681fc13e19b19626b1709ea45f7d38278653 /gst-libs | |
| parent | 9533d1f165bbc727a089f8fe0db53ccf96fd8673 (diff) | |
| download | gstreamer-plugins-bad-442114c60673ed9dbdae15622329b1cecebbd672.tar.gz | |
videoaggregator: Don't update the ts-offset before updating the actual configured caps
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/gst/video/gstvideoaggregator.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/gst-libs/gst/video/gstvideoaggregator.c b/gst-libs/gst/video/gstvideoaggregator.c index baacdb5df..16ef61833 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, |