From faee020994bd3e46c2d9e7e1a96ae11b2162b888 Mon Sep 17 00:00:00 2001 From: Vivia Nikolaidou Date: Thu, 11 Oct 2018 13:55:01 +0300 Subject: [PATCH] splitmuxsink: Fix if condition in drop-frame timecode wrap-around Was previously: if ( x | y && a == b). Changed it into if ((x & y) && (a == b)). --- gst/multifile/gstsplitmuxsink.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gst/multifile/gstsplitmuxsink.c b/gst/multifile/gstsplitmuxsink.c index bd9ed8041f..c8969f7fe0 100644 --- a/gst/multifile/gstsplitmuxsink.c +++ b/gst/multifile/gstsplitmuxsink.c @@ -1199,8 +1199,8 @@ calculate_next_max_timecode (GstSplitMuxSink * splitmux, day_in_ns - cur_tc_time + target_tc_time + splitmux->fragment_start_time; - if (cur_tc->config.flags | GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME && - cur_tc->config.fps_d == 1001) { + if ((cur_tc->config.flags & GST_VIDEO_TIME_CODE_FLAGS_DROP_FRAME) && + (cur_tc->config.fps_d == 1001)) { /* Checking fps_d is probably unneeded, but better safe than sorry * (e.g. someone accidentally set a flag) */ guint frames_of_daily_jam;