From c07415b8bdb3148b42f4c4bbb484c721f6ac093b Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Tue, 20 Sep 2011 11:04:54 +0000 Subject: [PATCH] emotion: don't use the pipeline anymore when it's not needed. SVN revision: 63497 --- legacy/emotion/src/modules/gstreamer/emotion_gstreamer.c | 5 +++-- legacy/emotion/src/modules/gstreamer/emotion_sink.c | 1 - 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 ce903ee..3a38edc 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) ev = (Emotion_Gstreamer_Video *)video; - if (!_emotion_gstreamer_video_pipeline_parse(ev, EINA_FALSE)) - goto on_error; + if (ev->pipeline && (!ev->video_stream_nbr || !ev->video_streams)) + if (!_emotion_gstreamer_video_pipeline_parse(ev, EINA_FALSE)) + goto on_error; vstream = eina_list_nth(ev->video_streams, ev->video_stream_nbr - 1); if (vstream) diff --git a/legacy/emotion/src/modules/gstreamer/emotion_sink.c b/legacy/emotion/src/modules/gstreamer/emotion_sink.c index d9a2392..dfb6e02 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, #else # warning "no ecore_x or xoverlay" #endif - fprintf(stderr, "sink: %p\n", sink); if (!sink) { sink = gst_element_factory_make("emotion-sink", "sink"); -- 2.7.4