summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2019-01-25 14:38:05 +0200
committerTim-Philipp Müller <tim@centricular.com>2019-05-01 23:56:23 +0100
commitf2752a428775b0dbaae39b166b284a0d32179284 (patch)
tree42ac91b7d3e089816e83fb290daedd0ecd4480c0
parent3e3faacf89dc7cc41e4897c170882bcc4a502569 (diff)
x264: Only enable dynamic loading code for x264 < 253
Otherwise we get some compiler warnings: ../subprojects/gst-plugins-ugly/ext/x264/gstx264enc.c:200:1: warning: ‘unload_x264’ defined but not used [-Wunused-function] unload_x264 (GstX264EncVTable * vtable) ^~~~~~~~~~~ ../subprojects/gst-plugins-ugly/ext/x264/gstx264enc.c:154:1: warning: ‘load_x264’ defined but not used [-Wunused-function] load_x264 (const gchar * filename) ^~~~~~~~~
-rw-r--r--ext/x264/gstx264enc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/x264/gstx264enc.c b/ext/x264/gstx264enc.c
index 071323d4..b6dde5ed 100644
--- a/ext/x264/gstx264enc.c
+++ b/ext/x264/gstx264enc.c
@@ -143,6 +143,7 @@ static GstX264EncVTable default_vtable;
static GstX264EncVTable *vtable_8bit = NULL, *vtable_10bit = NULL;
+#if X264_BUILD < 153
#define LOAD_SYMBOL(name) G_STMT_START { \
if (!g_module_symbol (module, #name, (gpointer *) &vtable->name)) { \
GST_ERROR ("Failed to load '" #name "' from '%s'", filename); \
@@ -172,9 +173,7 @@ load_x264 (const gchar * filename)
"' from '%s'. Incompatible version?", filename);
goto error;
}
-#if X264_BUILD < 153
LOAD_SYMBOL (x264_bit_depth);
-#endif
LOAD_SYMBOL (x264_chroma_format);
LOAD_SYMBOL (x264_encoder_close);
LOAD_SYMBOL (x264_encoder_delayed_frames);
@@ -209,6 +208,7 @@ unload_x264 (GstX264EncVTable * vtable)
#endif
#undef LOAD_SYMBOL
+#endif
static gboolean
gst_x264_enc_add_x264_chroma_format (GstStructure * s,