basevideo: Fix GType names to not conflict with the public video base classes
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Sat, 9 Jul 2011 08:44:16 +0000 (10:44 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Sat, 9 Jul 2011 09:06:06 +0000 (11:06 +0200)
It's still not possible to include headers of both in the same file
or compile/link both into the same plugin but that shouldn't be
necessary anyway.

omx/Makefile.am

index 1e43413..6633611 100644 (file)
@@ -16,12 +16,21 @@ noinst_HEADERS = \
        gstbasevideodecoder.h \
        gstbasevideoencoder.h
 
+fixbaseclasses = \
+        -DGstBaseVideoCodec=OMXBaseVideoCodec \
+        -DGstBaseVideoCodecClass=OMXBaseVideoCodecClass \
+        -DGstBaseVideoEncoder=OMXBaseVideoEncoder \
+        -DGstBaseVideoEncoderClass=OMXBaseVideoEncoderClass \
+        -DGstBaseVideoDecoder=OMXBaseVideoDecoder \
+        -DGstBaseVideoDecoderClass=OMXBaseVideoDecoderClass
+
 libgstomx_la_CFLAGS = \
        -DGST_USE_UNSTABLE_API=1 \
        -I$(srcdir)/openmax \
        $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) \
-       $(GST_CFLAGS)
+       $(GST_CFLAGS) \
+       $(fixbaseclasses)
 libgstomx_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
        -lgstvideo-@GST_MAJORMINOR@ \