summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/modules/gstreamer
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2009-04-17 19:40:41 +0000
committerVincent Torri <vincent.torri@gmail.com>2009-04-17 19:40:41 +0000
commit17e4571dfff405f538612bcb710a429e14d5ec5e (patch)
treeca7aeb937706b94cba29d23711632f3dea6c3ae1 /legacy/emotion/src/modules/gstreamer
parent0f8b812d0c0a0fb8694a9318664ffc4e1ec469a2 (diff)
Add preliminary patch for compilation on Windows. Needs more work, though
Patch by Lars Munch - Thanks a lot ! SVN revision: 40147
Diffstat (limited to 'legacy/emotion/src/modules/gstreamer')
-rw-r--r--legacy/emotion/src/modules/gstreamer/Makefile.am3
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/legacy/emotion/src/modules/gstreamer/Makefile.am b/legacy/emotion/src/modules/gstreamer/Makefile.am
index 6aee2e3fb3..533ab0c35c 100644
--- a/legacy/emotion/src/modules/gstreamer/Makefile.am
+++ b/legacy/emotion/src/modules/gstreamer/Makefile.am
@@ -7,6 +7,7 @@ AM_CPPFLAGS = \
7-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 7-DPACKAGE_BIN_DIR=\"$(bindir)\" \
8-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 8-DPACKAGE_LIB_DIR=\"$(libdir)\" \
9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 9-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
10@EFL_EMOTION_BUILD@ \
10@EVAS_CFLAGS@ \ 11@EVAS_CFLAGS@ \
11@ECORE_CFLAGS@ \ 12@ECORE_CFLAGS@ \
12@GST_CFLAGS@ 13@GST_CFLAGS@
@@ -27,7 +28,7 @@ emotion_gstreamer_pipeline_file.c \
27emotion_gstreamer_pipeline_uri.c \ 28emotion_gstreamer_pipeline_uri.c \
28emotion_gstreamer_pipeline_v4l.c 29emotion_gstreamer_pipeline_v4l.c
29gstreamer_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @GST_LIBS@ $(top_builddir)/src/lib/libemotion.la 30gstreamer_la_LIBADD = @EVAS_LIBS@ @ECORE_LIBS@ @GST_LIBS@ $(top_builddir)/src/lib/libemotion.la
30gstreamer_la_LDFLAGS = -module -avoid-version 31gstreamer_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
31gstreamer_la_LIBTOOLFLAGS = --tag=disable-static 32gstreamer_la_LIBTOOLFLAGS = --tag=disable-static
32gstreamer_la_DEPENDENCIES = $(top_builddir)/config.h 33gstreamer_la_DEPENDENCIES = $(top_builddir)/config.h
33 34
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
index 1449819889..943e31f2c7 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
@@ -6,11 +6,10 @@
6 6
7#include <Eina.h> 7#include <Eina.h>
8 8
9#include "Emotion.h"
10#include "emotion_private.h" 9#include "emotion_private.h"
11#include "emotion_gstreamer.h" 10#include "emotion_gstreamer.h"
12#include "emotion_gstreamer_pipeline.h" 11#include "emotion_gstreamer_pipeline.h"
13 12#include "Emotion.h"
14 13
15/* Callbacks to get the eos */ 14/* Callbacks to get the eos */
16static int _eos_timer_fct (void *data); 15static int _eos_timer_fct (void *data);