mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-27 12:11:13 +00:00
dshowsrcwrapper: remove cplusplus condition
This commit is contained in:
parent
0f10b769bf
commit
a22eca4e67
2 changed files with 0 additions and 17 deletions
|
@ -373,7 +373,5 @@ GstCaps *gst_dshow_new_video_caps (GstVideoFormat video_format, const gchar* nam
|
||||||
(gint) (10000000 / vscc->MinFrameInterval), 1,
|
(gint) (10000000 / vscc->MinFrameInterval), 1,
|
||||||
NULL);
|
NULL);
|
||||||
|
|
||||||
g_print ("caps are %s\n", gst_caps_to_string (video_caps));
|
|
||||||
|
|
||||||
return video_caps;
|
return video_caps;
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,15 +22,12 @@
|
||||||
#ifndef _GSTDSHOW_
|
#ifndef _GSTDSHOW_
|
||||||
#define _GSTDSHOW_
|
#define _GSTDSHOW_
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
#include <streams.h>
|
#include <streams.h>
|
||||||
#endif
|
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
#include <objbase.h>
|
#include <objbase.h>
|
||||||
#include <dshow.h>
|
#include <dshow.h>
|
||||||
#include <Rpc.h>
|
#include <Rpc.h>
|
||||||
|
|
||||||
#include <glib.h>
|
|
||||||
#include <gst/gst.h>
|
#include <gst/gst.h>
|
||||||
#include <gst/video/video.h>
|
#include <gst/video/video.h>
|
||||||
|
|
||||||
|
@ -52,13 +49,6 @@ typedef struct _GstCaptureVideoDefault
|
||||||
|
|
||||||
} 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 */
|
/* free memory of the input pin mediatype */
|
||||||
void gst_dshow_free_pin_mediatype (gpointer pt);
|
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,
|
const VIDEO_STREAM_CONFIG_CAPS * vscc, const VIDEOINFOHEADER *video_info,
|
||||||
GstCaptureVideoDefault *video_default);
|
GstCaptureVideoDefault *video_default);
|
||||||
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* _GSTDSHOW_ */
|
#endif /* _GSTDSHOW_ */
|
Loading…
Reference in a new issue