Merge branch 'update2013' of https://github.com/ofTheo/videoInput int…

…o update2013

Conflicts:
	videoInputSrcAndDemos/VS-videoInputDemoWithSrc/videoInputBasicDemo.v11.suo

.gitignore

@@ -18,6 +18,7 @@ obj/
 *.lastbuildstate
 *.ncb
 *.ipch
+*.suo
 
 #codeblocks files
 */*/*.layout

videoInputSrcAndDemos/CodeBlocks-compileAsLib/videoInputLib/videoInputLib.depend

@@ -184,3 +184,82 @@
 	<pshpack2.h>
 	<poppack.h>
 
+1373814362 source:c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\videoinput\videoinput.cpp
+	<iostream>
+	"videoInput.h"
+	<tchar.h>
+	<DShow.h>
+	<uuids.h>
+	<Aviriff.h>
+	<Windows.h>
+	<process.h>
+
+1373812707 c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\videoinput\videoinput.h
+	<stdlib.h>
+	<stdio.h>
+	<math.h>
+	<string.h>
+	<wchar.h>
+	<string>
+	<vector>
+	<windows.h>
+
+1373139129 c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\dshow\include\dshow.h
+	<windows.h>
+	<windowsx.h>
+	<olectl.h>
+	<ddraw.h>
+	<mmsystem.h>
+	<strmif.h>
+	<amvideo.h>
+	<amaudio.h>
+	<control.h>
+	<evcode.h>
+	<uuids.h>
+	<errors.h>
+	<edevdefs.h>
+	<audevcod.h>
+	<dvdevcod.h>
+
+1373139865 c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\dshow\include\ddraw.h
+	<objbase.h>
+
+1373139866 c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\dshow\include\strmif.h
+
+1373139129 c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\dshow\include\amvideo.h
+	<ddraw.h>
+
+1373139129 c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\dshow\include\amaudio.h
+	<mmsystem.h>
+	<dsound.h>
+
+1373139865 c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\dshow\include\dsound.h
+	<objbase.h>
+	<float.h>
+
+1373139129 c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\dshow\include\control.h
+	"rpc.h"
+	"rpcndr.h"
+
+1373139865 c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\dshow\include\evcode.h
+
+1373139866 c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\dshow\include\uuids.h
+	"ksuuids.h"
+
+1373139866 c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\dshow\include\ksuuids.h
+
+1373139865 c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\dshow\include\errors.h
+	<VFWMSGS.H>
+
+1373139866 c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\dshow\include\vfwmsgs.h
+
+1373139865 c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\dshow\include\edevdefs.h
+
+1373139129 c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\dshow\include\audevcod.h
+
+1373139865 c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\dshow\include\dvdevcod.h
+
+1373139129 c:\users\theo\documents\github\videoinput\videoinputsrcanddemos\libs\dshow\include\aviriff.h
+	<pshpack2.h>
+	<poppack.h>
+

videoInputSrcAndDemos/CodeBlocks-compileAsLib/videoInputLib/videoInputLib.layout

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_layout_file>
 	<ActiveTarget name="Debug" />
-	<File name="..\..\libs\videoInput\videoInput.cpp" open="1" top="1" tabpos="1">
-		<Cursor position="48020" topLine="1584" />
+	<File name="..\..\libs\videoInput\videoInput.h" open="1" top="0" tabpos="21" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="0" />
+		</Cursor>
 	</File>
-	<File name="..\..\libs\videoInput\videoInput.h" open="1" top="0" tabpos="2">
-		<Cursor position="5181" topLine="139" />
+	<File name="..\..\libs\videoInput\videoInput.cpp" open="1" top="1" tabpos="20" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
+		<Cursor>
+			<Cursor1 position="0" topLine="0" />
+		</Cursor>
 	</File>
 </CodeBlocks_layout_file>