From f741543a3fbdee29a646120b40a5c93e33601773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 28 Jun 2022 01:29:06 +0100 Subject: [PATCH] dv, opusparse: fix duplicate symbols in static build Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1262 Part-of: --- subprojects/gst-plugins-bad/ext/opus/gstopusheader.h | 4 ++++ subprojects/gst-plugins-good/ext/dv/meson.build | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/subprojects/gst-plugins-bad/ext/opus/gstopusheader.h b/subprojects/gst-plugins-bad/ext/opus/gstopusheader.h index 2a91c03f7c..29005e0afc 100644 --- a/subprojects/gst-plugins-bad/ext/opus/gstopusheader.h +++ b/subprojects/gst-plugins-bad/ext/opus/gstopusheader.h @@ -26,6 +26,10 @@ G_BEGIN_DECLS +#define gst_opus_header_is_header gst_opusparse_header_is_header +#define gst_opus_header_is_id_header gst_opusparse_header_is_id_header +#define gst_opus_header_is_comment_header gst_opusparse_header_is_comment_header + extern gboolean gst_opus_header_is_header (GstBuffer * buf, const char *magic, guint magic_size); extern gboolean gst_opus_header_is_id_header (GstBuffer * buf); diff --git a/subprojects/gst-plugins-good/ext/dv/meson.build b/subprojects/gst-plugins-good/ext/dv/meson.build index d6c0c0730d..a95bf48518 100644 --- a/subprojects/gst-plugins-good/ext/dv/meson.build +++ b/subprojects/gst-plugins-good/ext/dv/meson.build @@ -4,7 +4,6 @@ dv_sources = [ 'gstdvdec.c', 'gstdvdemux.c', 'gstsmptetimecode.c', - 'smpte_test.c', ] dv_dep = dependency('libdv', version : '>= 0.100', required : get_option('dv'),