diff options
author | Julien Isorce <julien.isorce@gmail.com> | 2009-09-03 17:20:47 +0200 |
---|---|---|
committer | Julien Isorce <julien.isorce@gmail.com> | 2009-09-03 17:20:47 +0200 |
commit | a22eca4e67b3bff1c4018187156005c3d5897644 (patch) | |
tree | 3b02214052f5ebee018a92bbb410493fbd3cb4b5 | |
parent | 0f10b769bf3893758da0085c3c9dab4d91f84b39 (diff) |
dshowsrcwrapper: remove cplusplus condition
-rwxr-xr-x | sys/dshowsrcwrapper/gstdshow.cpp | 2 | ||||
-rwxr-xr-x | sys/dshowsrcwrapper/gstdshow.h | 15 |
2 files changed, 0 insertions, 17 deletions
diff --git a/sys/dshowsrcwrapper/gstdshow.cpp b/sys/dshowsrcwrapper/gstdshow.cpp index e3a4f4a61..319d4df80 100755 --- a/sys/dshowsrcwrapper/gstdshow.cpp +++ b/sys/dshowsrcwrapper/gstdshow.cpp @@ -373,7 +373,5 @@ GstCaps *gst_dshow_new_video_caps (GstVideoFormat video_format, const gchar* nam (gint) (10000000 / vscc->MinFrameInterval), 1, NULL); - g_print ("caps are %s\n", gst_caps_to_string (video_caps)); - return video_caps; } diff --git a/sys/dshowsrcwrapper/gstdshow.h b/sys/dshowsrcwrapper/gstdshow.h index f13d9a8d2..553b42fe6 100755 --- a/sys/dshowsrcwrapper/gstdshow.h +++ b/sys/dshowsrcwrapper/gstdshow.h @@ -22,15 +22,12 @@ #ifndef _GSTDSHOW_ #define _GSTDSHOW_ -#ifdef __cplusplus #include <streams.h> -#endif #include <windows.h> #include <objbase.h> #include <dshow.h> #include <Rpc.h> -#include <glib.h> #include <gst/gst.h> #include <gst/video/video.h> @@ -52,13 +49,6 @@ typedef struct _GstCaptureVideoDefault } GstCaptureVideoDefault; -#ifdef __cplusplus
-extern "C" {
-#endif - -/* register fake filters as COM object and as Direct Show filters in the registry */ -//HRESULT gst_dshow_register_fakefilters (); - /* free memory of the input pin mediatype */ void gst_dshow_free_pin_mediatype (gpointer pt); @@ -91,9 +81,4 @@ GstCaps *gst_dshow_new_video_caps (GstVideoFormat video_format, const gchar* nam const VIDEO_STREAM_CONFIG_CAPS * vscc, const VIDEOINFOHEADER *video_info, GstCaptureVideoDefault *video_default); -
-#ifdef __cplusplus
-}
-#endif - #endif /* _GSTDSHOW_ */
\ No newline at end of file |