You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
40 lines
1.2 KiB
40 lines
1.2 KiB
11 years ago
|
From 921675c4e233d8f9e78786550d549e9e05ffeb2a Mon Sep 17 00:00:00 2001
|
||
|
|
From: Dirk Van Haerenborgh <vhdirk@gmail.com>
|
||
|
|
Date: Thu, 21 Mar 2013 16:11:53 +0100
|
||
|
|
Subject: [PATCH 0552/3152] eliminated warnings
|
||
|
|
|
||
|
|
---
|
||
|
|
modules/highgui/src/cap_gstreamer.cpp | 9 +++++----
|
||
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules/highgui/src/cap_gstreamer.cpp b/modules/highgui/src/cap_gstreamer.cpp
|
||
|
|
index b1a2ca0..9ef0a3f 100644
|
||
|
|
--- a/modules/highgui/src/cap_gstreamer.cpp
|
||
|
|
+++ b/modules/highgui/src/cap_gstreamer.cpp
|
||
|
|
@@ -83,7 +83,8 @@ static cv::Mutex gst_initializer_mutex;
|
||
|
|
/*!
|
||
|
|
* \brief The gst_initializer class
|
||
|
|
* Initializes gstreamer once in the whole process
|
||
|
|
- */class gst_initializer
|
||
|
|
+ */
|
||
|
|
+class gst_initializer
|
||
|
|
{
|
||
|
|
public:
|
||
|
|
static void init()
|
||
|
|
@@ -1007,9 +1008,9 @@ void CvVideoWriter_GStreamer::init()
|
||
|
|
*/
|
||
|
|
void CvVideoWriter_GStreamer::close()
|
||
|
|
{
|
||
|
|
- if (pipeline) {
|
||
|
|
- GstFlowReturn ret;
|
||
|
|
- ret = gst_app_src_end_of_stream(GST_APP_SRC(source));
|
||
|
|
+ if (pipeline)
|
||
|
|
+ {
|
||
|
|
+ gst_app_src_end_of_stream(GST_APP_SRC(source));
|
||
|
|
|
||
|
|
//wait for EOS to trickle down the pipeline. This will let all elements finish properly
|
||
|
|
GstBus* bus = gst_element_get_bus(pipeline);
|
||
|
|
--
|
||
|
|
1.9.3
|
||
|
|
|