From 80c254fa4fbc465df03ea4fd5d15a08e9df8bbea Mon Sep 17 00:00:00 2001
From: Martin Pulec <pulec@cesnet.cz>
Date: Tue, 12 Nov 2013 17:15:08 +0100
Subject: [PATCH] dshow: fixed CS initialization

---
 src/video_capture/DirectShowGrabber.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/video_capture/DirectShowGrabber.cpp b/src/video_capture/DirectShowGrabber.cpp
index 592009eda..dfe2b182c 100644
--- a/src/video_capture/DirectShowGrabber.cpp
+++ b/src/video_capture/DirectShowGrabber.cpp
@@ -661,6 +661,9 @@ void * vidcap_dshow_init(char *init_fmt, unsigned int flags) {
 		return NULL;
 	}
 
+	InitializeConditionVariable(&s->grabWaitCV);
+	InitializeCriticalSection(&s->returnBufferCS);
+
 	if (init_fmt && strcmp(init_fmt, "help") == 0) {
 		show_help(s); 
 		cleanup(s);
@@ -675,8 +678,6 @@ void * vidcap_dshow_init(char *init_fmt, unsigned int flags) {
 		if (!process_args(s, init_fmt)) goto error;
 	}
 
-	InitializeConditionVariable(&s->grabWaitCV);
-
 	// Select video capture device
 	if (s->deviceNumber != -1) { // Device was specified by number
 		for (int i = 1; i <= s->deviceNumber; i++) {