mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-29 11:40:38 +00:00
omx: Use libgstopenmax.so for the plugin filename and openmax for the plugin name
Resolves conflicts with gst-openmax.
This commit is contained in:
parent
2343decb3c
commit
e8b2ffe6f4
2 changed files with 6 additions and 6 deletions
|
@ -1,6 +1,6 @@
|
|||
plugin_LTLIBRARIES = libgstomx.la
|
||||
plugin_LTLIBRARIES = libgstopenmax.la
|
||||
|
||||
libgstomx_la_SOURCES = \
|
||||
libgstopenmax_la_SOURCES = \
|
||||
gstomx.c \
|
||||
gstomxvideodec.c \
|
||||
gstomxvideoenc.c \
|
||||
|
@ -32,19 +32,19 @@ fixbaseclasses = \
|
|||
-DGstBaseVideoDecoder=OMXBaseVideoDecoder \
|
||||
-DGstBaseVideoDecoderClass=OMXBaseVideoDecoderClass
|
||||
|
||||
libgstomx_la_CFLAGS = \
|
||||
libgstopenmax_la_CFLAGS = \
|
||||
-DGST_USE_UNSTABLE_API=1 \
|
||||
-I$(srcdir)/openmax \
|
||||
$(GST_PLUGINS_BASE_CFLAGS) \
|
||||
$(GST_BASE_CFLAGS) \
|
||||
$(GST_CFLAGS) \
|
||||
$(fixbaseclasses)
|
||||
libgstomx_la_LIBADD = \
|
||||
libgstopenmax_la_LIBADD = \
|
||||
$(GST_PLUGINS_BASE_LIBS) \
|
||||
-lgstvideo-@GST_MAJORMINOR@ \
|
||||
$(GST_BASE_LIBS) \
|
||||
$(GST_LIBS)
|
||||
libgstomx_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
libgstopenmax_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
|
||||
EXTRA_DIST = openmax gstomx.conf
|
||||
|
||||
|
|
|
@ -1912,7 +1912,7 @@ done:
|
|||
|
||||
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
|
||||
GST_VERSION_MINOR,
|
||||
"omx",
|
||||
"openmax",
|
||||
"GStreamer OpenMAX Plug-ins",
|
||||
plugin_init,
|
||||
PACKAGE_VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
|
||||
|
|
Loading…
Reference in a new issue