Merge branch 'master' into refactor/move-demuxer-options-to-struct

Author: AhmedAlian7

docs/CHANGES.TXT

@@ -1,5 +1,6 @@
 0.96.6 (unreleased)
 -------------------
+- Fix: DVB EIT start time BCD decoding in XMLTV output causing invalid timestamps (#1835)
 - New: Add Snap packaging support with Snapcraft configuration and GitHub Actions CI workflow. 
 - Fix: Clear status line output on Linux/WSL to prevent text artifacts (#2017)
 - Fix: Prevent infinite loop on truncated MKV files
@@ -8,6 +9,7 @@
 - Fix: --mkvlang now supports BCP 47 language tags (e.g., en-US, zh-Hans-CN) and multiple codes
 - Refactor: Move demuxer-related options (live_stream, buffer_input, input_source, binary_concat)
   from global ccx_options to ccx_demuxer struct for better encapsulation and testability
+- Fix: segmentation fault when using --multiprogram
 
 0.96.5 (2026-01-05)
 -------------------

src/lib_ccx/ccx_encoders_common.c

@@ -176,6 +176,14 @@ int write_subtitle_file_footer(struct encoder_ctx *ctx, struct ccx_s_write *out)
 		case CCX_OF_CCD:
 			ret = write(out->fh, ctx->encoded_crlf, ctx->encoded_crlf_length);
 			break;
+		case CCX_OF_WEBVTT:
+			// Ensure WebVTT header is written even if no subtitles were found (issue #1743)
+			// This is required for HLS compatibility
+			if (!ctx->wrote_webvtt_header)
+			{
+				write_webvtt_header(ctx);
+			}
+			break;
 		default: // Nothing to do, no footer on this format
 			break;
 	}

src/lib_ccx/ccx_encoders_common.h

@@ -184,8 +184,8 @@ struct encoder_ctx
 	int nospupngocr;
 	int is_pal;
 
-	struct ccx_s_write *tlt_out[MAX_TLT_PAGES_EXTRACT]; // Output files per teletext page
-	uint16_t tlt_out_pages[MAX_TLT_PAGES_EXTRACT];       // Page numbers for each output slot
+	struct ccx_s_write *tlt_out[MAX_TLT_PAGES_EXTRACT];  // Output files per teletext page
+	uint16_t tlt_out_pages[MAX_TLT_PAGES_EXTRACT];	     // Page numbers for each output slot
 	unsigned int tlt_srt_counter[MAX_TLT_PAGES_EXTRACT]; // SRT counter per page
 	int tlt_out_count;				     // Number of teletext output files
 };
@@ -263,6 +263,9 @@ int write_cc_bitmap_as_libcurl(struct cc_subtitle *sub, struct encoder_ctx *cont
 void write_spumux_header(struct encoder_ctx *ctx, struct ccx_s_write *out);
 void write_spumux_footer(struct ccx_s_write *out);
 
+// WebVTT header writer (issue #1743 - ensures header is written even for empty files)
+void write_webvtt_header(struct encoder_ctx *context);
+
 struct cc_subtitle *reformat_cc_bitmap_through_sentence_buffer(struct cc_subtitle *sub, struct encoder_ctx *context);
 
 void set_encoder_last_displayed_subs_ms(struct encoder_ctx *ctx, LLONG last_displayed_subs_ms);

src/lib_ccx/ccx_encoders_webvtt.c

@@ -220,8 +220,9 @@ void write_webvtt_header(struct encoder_ctx *context)
 		millis_to_time(context->timing->sync_pts2fts_fts, &h1, &m1, &s1, &ms1);
 
 		// If the user has enabled X-TIMESTAMP-MAP
-		snprintf(header_string, sizeof(header_string), "X-TIMESTAMP-MAP=MPEGTS:%ld,LOCAL:%02u:%02u:%02u.%03u%s",
-			 context->timing->sync_pts2fts_pts, h1, m1, s1, ms1,
+		// LOCAL must come before MPEGTS for HLS compatibility (issue #1743)
+		snprintf(header_string, sizeof(header_string), "X-TIMESTAMP-MAP=LOCAL:%02u:%02u:%02u.%03u,MPEGTS:%ld%s",
+			 h1, m1, s1, ms1, context->timing->sync_pts2fts_pts,
 			 ccx_options.enc_cfg.line_terminator_lf ? "\n\n" : "\r\n\r\n");
 
 		used = encode_line(context, context->buffer, (unsigned char *)header_string);

src/lib_ccx/lib_ccx.c

@@ -473,7 +473,7 @@ struct encoder_ctx *update_encoder_list_cinfo(struct lib_ccx_ctx *ctx, struct ca
 		}
 
 		list_add_tail(&(enc_ctx->list), &(ctx->enc_ctx_head));
-		freep(ccx_options.enc_cfg.output_filename);
+		freep(&ccx_options.enc_cfg.output_filename);
 	}
 	// DVB related
 	enc_ctx->prev = NULL;

src/lib_ccx/output.c

@@ -249,9 +249,22 @@ void writercwtdata(struct lib_cc_decode *ctx, const unsigned char *data, struct
 	LLONG currfts = ctx->timing->fts_now + ctx->timing->fts_global;
 	static uint16_t cbcount = 0;
 	static int cbempty = 0;
-	static unsigned char cbbuffer[0xFFFF * 3]; // TODO: use malloc
+	static unsigned char *cbbuffer = NULL;
+	static int cbbuffer_initialized = 0;
 	static unsigned char cbheader[8 + 2];
 
+	if (!cbbuffer_initialized)
+	{
+		cbbuffer = (unsigned char *)malloc(0xFFFF * 3);
+		if (cbbuffer == NULL)
+		{
+			mprint("Error: Failed to allocate memory for cbbuffer\n");
+			return;
+		}
+		cbbuffer_initialized = 1;
+		dbg_print(CCX_DMT_VERBOSE, "Allocated RCWT buffer (%d bytes)\n", 0xFFFF * 3);
+	}
+
 	if ((prevfts != currfts && prevfts != -1) || data == NULL || cbcount == 0xFFFF)
 	{
 		// Remove trailing empty or 608 padding caption blocks

src/lib_ccx/ts_tables_epg.c

@@ -136,6 +136,7 @@ void EPG_DVB_calc_start_time(struct EPG_event *event, uint64_t time)
 	if (mjd > 0)
 	{
 		long y, m, d, k;
+		struct tm timeinfo = {0};
 
 		// algo: ETSI EN 300 468 - ANNEX C
 		y = (long)((mjd - 15078.2) / 365.25);
@@ -145,7 +146,32 @@ void EPG_DVB_calc_start_time(struct EPG_event *event, uint64_t time)
 		y = y + k + 1900;
 		m = m - 1 - k * 12;
 
-		snprintf(event->start_time_string, sizeof(event->start_time_string), "%02ld%02ld%02ld%06" PRIu64 "+0000", y, m, d, time & 0xffffff);
+		timeinfo.tm_year = y - 1900;
+		timeinfo.tm_mon = m - 1;
+		timeinfo.tm_mday = d;
+
+		// Decode BCD time (lower 24 bits: HHMMSS)
+		uint32_t bcd = (uint32_t)(time & 0xFFFFFF);
+
+		timeinfo.tm_sec = (bcd & 0x0f) + (10 * ((bcd & 0xf0) >> 4));
+
+		timeinfo.tm_min = ((bcd & 0x0f00) >> 8) + (10 * ((bcd & 0xf000) >> 12));
+
+		timeinfo.tm_hour = ((bcd & 0x0f0000) >> 16) + (10 * ((bcd & 0xf00000) >> 20));
+
+		timeinfo.tm_isdst = -1;
+
+		mktime(&timeinfo);
+
+		snprintf(event->start_time_string,
+			 sizeof(event->start_time_string),
+			 "%04d%02d%02d%02d%02d%02d +0000",
+			 timeinfo.tm_year + 1900,
+			 timeinfo.tm_mon + 1,
+			 timeinfo.tm_mday,
+			 timeinfo.tm_hour,
+			 timeinfo.tm_min,
+			 timeinfo.tm_sec);
 	}
 }
 

src/rust/Cargo.lock

@@ -18,7 +18,7 @@ tesseract-sys = { version = "0.5.15", optional = true, default-features = false
 leptonica-sys = { version = "= 0.4.6", optional = true, default-features = false }
 clap = { version = "4.5.31", features = ["derive"] }
 strum_macros = "0.25.3"
-time = "0.3.39"
+time = "0.3.47"
 cfg-if = "1.0.0"
 num-integer = "0.1.46"
 lib_ccxr = { path = "lib_ccxr" }