summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-07-17 18:36:30 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-07-17 18:37:03 +0900
commit2e74e41ed324006eb686d2855b3bebbfb78a4c56 (patch)
tree178bc40a42cfffe7f905d8369e5fad18a777207f /src
parent23795d17338979d24f8a702be1af2ab664490d00 (diff)
emotion gst: disable x window under/overlay suport for now. broken badly.
Diffstat (limited to '')
-rw-r--r--src/modules/emotion/gstreamer/emotion_gstreamer.c3
-rw-r--r--src/modules/emotion/gstreamer/emotion_sink.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/modules/emotion/gstreamer/emotion_gstreamer.c b/src/modules/emotion/gstreamer/emotion_gstreamer.c
index 05b1fbe8dc..9fe654311b 100644
--- a/src/modules/emotion/gstreamer/emotion_gstreamer.c
+++ b/src/modules/emotion/gstreamer/emotion_gstreamer.c
@@ -17,6 +17,9 @@
17#include <gst/video/gstvideosink.h> 17#include <gst/video/gstvideosink.h>
18#include <gst/video/video.h> 18#include <gst/video/video.h>
19 19
20// forcibly disable x overlay window.. broken badly.
21#undef HAVE_ECORE_X
22
20#ifdef HAVE_ECORE_X 23#ifdef HAVE_ECORE_X
21# include <Ecore_X.h> 24# include <Ecore_X.h>
22# ifdef HAVE_XOVERLAY_H 25# ifdef HAVE_XOVERLAY_H
diff --git a/src/modules/emotion/gstreamer/emotion_sink.c b/src/modules/emotion/gstreamer/emotion_sink.c
index 5d16c8808b..1a1199f78e 100644
--- a/src/modules/emotion/gstreamer/emotion_sink.c
+++ b/src/modules/emotion/gstreamer/emotion_sink.c
@@ -14,6 +14,9 @@
14#include <gst/video/gstvideosink.h> 14#include <gst/video/gstvideosink.h>
15#include <gst/video/video.h> 15#include <gst/video/video.h>
16 16
17// forcibly disable x overlay window.. broken badly.
18#undef HAVE_ECORE_X
19
17#ifdef HAVE_ECORE_X 20#ifdef HAVE_ECORE_X
18# include <Ecore_X.h> 21# include <Ecore_X.h>
19# include <Ecore_Evas.h> 22# include <Ecore_Evas.h>