From c62dd0f0c346990a9f8e095836fe7e2cbeab1fbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Sat, 9 Jul 2011 10:44:16 +0200
Subject: [PATCH] basevideo: Fix GType names to not conflict with the public
 video base classes

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 | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/omx/Makefile.am b/omx/Makefile.am
index 1e43413b65..663361128e 100644
--- a/omx/Makefile.am
+++ b/omx/Makefile.am
@@ -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@ \