Merge branch 'master' into migration-demuxer-module

Author: steel-bucket

docker/dockerfile

@@ -33,9 +33,9 @@ COPY --from=builder /usr/lib/libgif.so.7 /usr/lib/
 COPY --from=builder /usr/lib/libtiff.so.6 /usr/lib/
 COPY --from=builder /usr/lib/libwebp.so.7 /usr/lib/
 COPY --from=builder /usr/lib/libwebpmux.so.3 /usr/lib/
-COPY --from=builder /lib/libz.so.1 /lib/
-COPY --from=builder /lib/libssl.so.3 /lib/
-COPY --from=builder /lib/libcrypto.so.3 /lib/
+COPY --from=builder /usr/lib/libz.so.1 /lib/
+COPY --from=builder /usr/lib/libssl.so.3 /lib/
+COPY --from=builder /usr/lib/libcrypto.so.3 /lib/
 COPY --from=builder /usr/lib/liblzma.so.5 /usr/lib/
 COPY --from=builder /usr/lib/libzstd.so.1 /usr/lib/
 COPY --from=builder /usr/lib/libsharpyuv.so.0 /usr/lib/

docs/CHANGES.TXT

@@ -1,5 +1,6 @@
 1.0 (to be released)
 -----------------
+- Fix: Improved handling of IETF language tags in Matroska files (#1665)
 - New: Create unit test for rust code (#1615)
 - Breaking: Major argument flags revamp for CCExtractor (#1564 & #1619)
 - New: Create a Docker image to simplify the CCExtractor usage without any environmental hustle (#1611)
@@ -37,6 +38,7 @@
 - Improvement: Ignore MXF Caption Essence Container version byte to enhance SRT subtitle extraction compatibility
 - New: Add tesseract page segmentation modes control with `--psm` flag
 - Fix: Resolve compile-time error about implicit declarations (#1646)
+- Fix: fatal out of memory error extracting from a VOB PS
 
 0.94 (2021-12-14)
 -----------------

linux/configure.ac

@@ -25,7 +25,7 @@ fi
 
 # Checks for libraries.
 AC_CHECK_LIB([m], [sin], [], [AC_MSG_ERROR(Math library not installed. Install it before proceeding.)])
-AC_CHECK_LIB([lept], [getLeptonicaVersion], [HAS_LEPT=1 && PKG_CHECK_MODULES([lept], [lept])], [HAS_LEPT=0])
+AC_CHECK_LIB([leptonica], [getLeptonicaVersion], [HAS_LEPT=1 && PKG_CHECK_MODULES([lept], [lept])], [HAS_LEPT=0])
 AC_CHECK_LIB([tesseract], [TessVersion], [HAS_TESSERACT=1 && PKG_CHECK_MODULES([tesseract], [tesseract])], [HAS_TESSERACT=0])
 AC_CHECK_LIB([avcodec], [avcodec_version], [HAS_AVCODEC=1 && PKG_CHECK_MODULES([libavcodec], [libavcodec])], [HAS_AVCODEC=0])
 AC_CHECK_LIB([avformat], [avformat_version], [HAS_AVFORMAT=1 && PKG_CHECK_MODULES([libavformat], [libavformat])], [HAS_AVFORMAT=0])

src/lib_ccx/asf_functions.c

@@ -561,7 +561,7 @@ int asf_get_more_data(struct lib_ccx_ctx *ctx, struct demuxer_data **ppdata)
 		dbg_print(CCX_DMT_PARSE, "Number of data packets: %ld\n", (long)asf_data_container.TotalDataPackets);
 
 		reentry = 0; // Make sure we read the Data Packet Headers
-	}		     // End of if (firstcall)
+	} // End of if (firstcall)
 	firstcall = 0;
 
 	// Start loop over Data Packets

src/lib_ccx/ccx_decoders_common.c

@@ -219,7 +219,7 @@ int do_cb(struct lib_cc_decode *ctx, unsigned char *cc_block, struct cc_subtitle
 			default:
 				fatal(CCX_COMMON_EXIT_BUG_BUG, "In do_cb: Impossible value for cc_type, Please file a bug report on GitHub.\n");
 		} // switch (cc_type)
-	}	  // cc_valid
+	} // cc_valid
 	else
 	{
 		dbg_print(CCX_DMT_CBRAW, "    ..   ..   ..\n");

src/lib_ccx/ccx_encoders_spupng.c

@@ -704,7 +704,7 @@ uint32_t *utf8_to_utf32(char *src)
 }
 
 // Convert big-endian and little-endian
-#define BigtoLittle32(A) ((((uint32_t)(A)&0xff000000) >> 24) | (((uint32_t)(A)&0x00ff0000) >> 8) | (((uint32_t)(A)&0x0000ff00) << 8) | (((uint32_t)(A)&0x000000ff) << 24))
+#define BigtoLittle32(A) ((((uint32_t)(A) & 0xff000000) >> 24) | (((uint32_t)(A) & 0x00ff0000) >> 8) | (((uint32_t)(A) & 0x0000ff00) << 8) | (((uint32_t)(A) & 0x000000ff) << 24))
 
 // Generate PNG file from an UTF-8 string (str)
 // PNG file will be stored at output

src/lib_ccx/dvb_subtitle_decoder.c

@@ -39,20 +39,20 @@
 
 #define YUV_TO_RGB1_CCIR(cb1, cr1)                                                               \
 	{                                                                                        \
-		cb = (cb1)-128;                                                                  \
-		cr = (cr1)-128;                                                                  \
+		cb = (cb1) - 128;                                                                \
+		cr = (cr1) - 128;                                                                \
 		r_add = FIX(1.40200 * 255.0 / 224.0) * cr + ONE_HALF;                            \
 		g_add = -FIX(0.34414 * 255.0 / 224.0) * cb - FIX(0.71414 * 255.0 / 224.0) * cr + \
 			ONE_HALF;                                                                \
 		b_add = FIX(1.77200 * 255.0 / 224.0) * cb + ONE_HALF;                            \
 	}
 
-#define YUV_TO_RGB2_CCIR(r, g, b, y1)               \
-	{                                           \
-		y = ((y1)-16) * FIX(255.0 / 219.0); \
-		r = cm[(y + r_add) >> SCALEBITS];   \
-		g = cm[(y + g_add) >> SCALEBITS];   \
-		b = cm[(y + b_add) >> SCALEBITS];   \
+#define YUV_TO_RGB2_CCIR(r, g, b, y1)                 \
+	{                                             \
+		y = ((y1) - 16) * FIX(255.0 / 219.0); \
+		r = cm[(y + r_add) >> SCALEBITS];     \
+		g = cm[(y + g_add) >> SCALEBITS];     \
+		b = cm[(y + b_add) >> SCALEBITS];     \
 	}
 
 #define times4(x) x, x, x, x

src/lib_ccx/dvd_subtitle_decoder.c

@@ -384,7 +384,7 @@ int process_spu(struct lib_cc_decode *dec_ctx, unsigned char *buff, int length,
 
 	if (ctx->append == 1)
 	{
-		memcpy(ctx->buffer + ctx->len, buff, length);
+		memmove(ctx->buffer + ctx->len, buff, length);
 		ctx->len += length;
 		ctx->append = 0;
 	}

src/lib_ccx/general_loop.c

@@ -993,7 +993,7 @@ int general_loop(struct lib_ccx_ctx *ctx)
 	enum ccx_stream_mode_enum stream_mode;
 	struct demuxer_data *datalist = NULL;
 	struct demuxer_data *data_node = NULL;
-	int (*get_more_data)(struct lib_ccx_ctx * c, struct demuxer_data * *d);
+	int (*get_more_data)(struct lib_ccx_ctx *c, struct demuxer_data **d);
 	int ret;
 	int caps = 0;
 

src/lib_ccx/hardsubx_decoder.c

@@ -552,7 +552,7 @@ void process_hardsubx_linear_frames_and_normal_subs(struct lib_hardsubx_ctx *har
 	enum ccx_stream_mode_enum stream_mode;
 	struct demuxer_data *datalist = NULL;
 	struct demuxer_data *data_node = NULL;
-	int (*get_more_data)(struct lib_ccx_ctx * c, struct demuxer_data * *d);
+	int (*get_more_data)(struct lib_ccx_ctx *c, struct demuxer_data **d);
 	int ret;
 	int caps = 0;