summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@samsung.com>2013-12-02 12:34:32 -0500
committerMike Blumenkrantz <zmike@samsung.com>2013-12-02 12:39:49 -0500
commitfe045f69891bded3e3429d2dc2033287aaa29e8e (patch)
treef486cf413195309c185be27b0638aedf95a13107 /src
parenta98fc0457e06167d96dfc0111c64fb3352f5dac0 (diff)
downloadevas_generic_loaders-fe045f69891bded3e3429d2dc2033287aaa29e8e.tar.gz
Revert "bugfix: support gstreamer 0.10 and 1.0"
This reverts commit e629f406a55489bcbf46f1e6b76b47fdfa72094b. somehow this went from compiling to not compiling in the time that I committed. I blame cedric.
Diffstat (limited to 'src')
-rw-r--r--src/bin/gst/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bin/gst/main.c b/src/bin/gst/main.c
index 2f396ba..140fe02 100644
--- a/src/bin/gst/main.c
+++ b/src/bin/gst/main.c
@@ -78,7 +78,7 @@ _gst_init(const char *filename)
g_error_free (error);
goto gst_shutdown;
}
-#ifndef USE_OLD_GST
+
g_object_get(G_OBJECT(pipeline),
"n-video", &vidstr,
NULL);
@@ -87,7 +87,7 @@ _gst_init(const char *filename)
D("no video stream\n");
goto gst_shutdown;
}
-#endif
+
sink = gst_bin_get_by_name (GST_BIN (pipeline), "sink");
ret = gst_element_set_state (pipeline, GST_STATE_PAUSED);