mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-01 04:58:47 +00:00
Code Issues 1 Projects Releases Wiki Activity

omx: Use libgstopenmax.so for the plugin filename and openmax for the plugin name

Browse source 
Resolves conflicts with gst-openmax.
This commit is contained in:
Sebastian Dröge 2011-07-20 11:09:54 +02:00
parent 2343decb3c
commit e8b2ffe6f4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
omx/Makefile.am
View file

@ -1,6 +1,6 @@
plugin_LTLIBRARIES = libgstomx.la plugin_LTLIBRARIES = libgstopenmax.la
libgstomx_la_SOURCES = \ libgstopenmax_la_SOURCES = \
gstomx.c \ gstomx.c \
gstomxvideodec.c \ gstomxvideodec.c \
gstomxvideoenc.c \ gstomxvideoenc.c \
@ -32,19 +32,19 @@ fixbaseclasses = \
-DGstBaseVideoDecoder=OMXBaseVideoDecoder \ -DGstBaseVideoDecoder=OMXBaseVideoDecoder \
-DGstBaseVideoDecoderClass=OMXBaseVideoDecoderClass -DGstBaseVideoDecoderClass=OMXBaseVideoDecoderClass
libgstomx_la_CFLAGS = \ libgstopenmax_la_CFLAGS = \
-DGST_USE_UNSTABLE_API=1 \ -DGST_USE_UNSTABLE_API=1 \
-I$(srcdir)/openmax \ -I$(srcdir)/openmax \
$(GST_PLUGINS_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \
$(GST_CFLAGS) \ $(GST_CFLAGS) \
$(fixbaseclasses) $(fixbaseclasses)
libgstomx_la_LIBADD = \ libgstopenmax_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \ $(GST_PLUGINS_BASE_LIBS) \
-lgstvideo-@GST_MAJORMINOR@ \ -lgstvideo-@GST_MAJORMINOR@ \
$(GST_BASE_LIBS) \ $(GST_BASE_LIBS) \
$(GST_LIBS) $(GST_LIBS)
libgstomx_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstopenmax_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
EXTRA_DIST = openmax gstomx.conf EXTRA_DIST = openmax gstomx.conf

2
omx/gstomx.c
View file

@ -1912,7 +1912,7 @@ done:
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"omx", "openmax",
"GStreamer OpenMAX Plug-ins", "GStreamer OpenMAX Plug-ins",
plugin_init, plugin_init,
PACKAGE_VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) PACKAGE_VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)