summaryrefslogtreecommitdiff
path: root/legacy/emotion/src/modules/gstreamer
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2011-09-20 11:04:54 +0000
committerCedric BAIL <cedric.bail@free.fr>2011-09-20 11:04:54 +0000
commitc07415b8bdb3148b42f4c4bbb484c721f6ac093b (patch)
tree08dc0926dedddfc406b9217a0845ba5fc70409e1 /legacy/emotion/src/modules/gstreamer
parent973717b9bf20831048e7924989f055274feb49ef (diff)
emotion: don't use the pipeline anymore when it's not needed.
SVN revision: 63497
Diffstat (limited to '')
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c5
-rw-r--r--legacy/emotion/src/modules/gstreamer/emotion_sink.c1
2 files changed, 3 insertions, 3 deletions
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
index ce903ee5dd..3a38edcc72 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c
@@ -870,8 +870,9 @@ em_video_data_size_get(void *video, int *w, int *h)
870 870
871 ev = (Emotion_Gstreamer_Video *)video; 871 ev = (Emotion_Gstreamer_Video *)video;
872 872
873 if (!_emotion_gstreamer_video_pipeline_parse(ev, EINA_FALSE)) 873 if (ev->pipeline && (!ev->video_stream_nbr || !ev->video_streams))
874 goto on_error; 874 if (!_emotion_gstreamer_video_pipeline_parse(ev, EINA_FALSE))
875 goto on_error;
875 876
876 vstream = eina_list_nth(ev->video_streams, ev->video_stream_nbr - 1); 877 vstream = eina_list_nth(ev->video_streams, ev->video_stream_nbr - 1);
877 if (vstream) 878 if (vstream)
diff --git a/legacy/emotion/src/modules/gstreamer/emotion_sink.c b/legacy/emotion/src/modules/gstreamer/emotion_sink.c
index d9a2392abf..dfb6e02a83 100644
--- a/legacy/emotion/src/modules/gstreamer/emotion_sink.c
+++ b/legacy/emotion/src/modules/gstreamer/emotion_sink.c
@@ -1051,7 +1051,6 @@ gstreamer_video_sink_new(Emotion_Gstreamer_Video *ev,
1051#else 1051#else
1052# warning "no ecore_x or xoverlay" 1052# warning "no ecore_x or xoverlay"
1053#endif 1053#endif
1054 fprintf(stderr, "sink: %p\n", sink);
1055 if (!sink) 1054 if (!sink)
1056 { 1055 {
1057 sink = gst_element_factory_make("emotion-sink", "sink"); 1056 sink = gst_element_factory_make("emotion-sink", "sink");