From 0518455163f64b4cd71d91f24b21d90b54e4da38 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 23 Sep 2014 14:15:36 +0400 Subject: [PATCH] More accurate selection of color space conversion element for GStreamer 1.x --- modules/videoio/src/cap_gstreamer.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/videoio/src/cap_gstreamer.cpp b/modules/videoio/src/cap_gstreamer.cpp index 5c19bad..5fc7c55 100644 --- a/modules/videoio/src/cap_gstreamer.cpp +++ b/modules/videoio/src/cap_gstreamer.cpp @@ -73,13 +73,14 @@ #define CV_WARN(message) fprintf(stderr, "warning: %s (%s:%d)\n", message, __FILE__, __LINE__) #endif -#if GST_VERSION_MAJOR > 0 -#define COLOR_ELEM "autovideoconvert" -#else +#if GST_VERSION_MAJOR == 0 #define COLOR_ELEM "ffmpegcolorspace" +#elif FULL_GST_VERSION < VERSION_NUM(1,5,0) +#define COLOR_ELEM "videoconvert" +#else +#define COLOR_ELEM "autovideoconvert" #endif - void toFraction(double decimal, double &numerator, double &denominator); void handleMessage(GstElement * pipeline); -- 2.7.4