Commit 7babb44d authored by Ghislain MARY's avatar Ghislain MARY

Fix build with Visual Studio when video is enabled.

parent 5d65225c
BEGIN { print("#include \"mediastreamer2/msfilter.h\"\n") } { printf("extern MSFilterDesc %s;\n",$1) }
\ No newline at end of file
BEGIN { print("#include \"mediastreamer2/msfilter.h\"\n") } { printf("MS2_VAR_PUBLIC MSFilterDesc %s;\n",$1) }
\ No newline at end of file
......@@ -58,8 +58,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#if defined(_MSC_VER)
#define MS2_PUBLIC __declspec(dllexport)
#define MS2_VAR_PUBLIC extern __declspec(dllexport)
#else
#define MS2_PUBLIC
#define MS2_VAR_PUBLIC extern
#endif
#if defined(_WIN32_WCE)
......
......@@ -304,7 +304,7 @@ MS2_PUBLIC MSFilterDesc *ms_filter_lookup_by_name(const char *filter_name);
* @param id a filter interface id
* @return a newly allocated MSList of #MSFilterDesc.
**/
MSList *ms_filter_lookup_by_interface(MSFilterInterfaceId id);
MS2_PUBLIC MSList *ms_filter_lookup_by_interface(MSFilterInterfaceId id);
/**
* Create encoder filter according to codec name.
......
......@@ -273,7 +273,7 @@ MS2_PUBLIC void deinterlace_and_rotate_180_neon(uint8_t* ysrc, uint8_t* cbcrsrc,
void deinterlace_down_scale_and_rotate_180_neon(uint8_t* ysrc, uint8_t* cbcrsrc, uint8_t* ydst, uint8_t* udst, uint8_t* vdst, int w, int h, int y_byte_per_row,int cbcr_byte_per_row,bool_t down_scale);
void deinterlace_down_scale_neon(uint8_t* ysrc, uint8_t* cbcrsrc, uint8_t* ydst, uint8_t* u_dst, uint8_t* v_dst, int w, int h, int y_byte_per_row,int cbcr_byte_per_row,bool_t down_scale);
#endif
mblk_t *copy_ycbcrbiplanar_to_true_yuv_with_rotation_and_down_scale_by_2(uint8_t* y, uint8_t * cbcr, int rotation, int w, int h, int y_byte_per_row,int cbcr_byte_per_row, bool_t uFirstvSecond, bool_t down_scale);
MS2_PUBLIC mblk_t *copy_ycbcrbiplanar_to_true_yuv_with_rotation_and_down_scale_by_2(uint8_t* y, uint8_t * cbcr, int rotation, int w, int h, int y_byte_per_row,int cbcr_byte_per_row, bool_t uFirstvSecond, bool_t down_scale);
static MS2_INLINE MSVideoSize ms_video_size_make(int width, int height){
MSVideoSize vsize={width,height};
......
......@@ -153,7 +153,7 @@ static MSFilter *mire_create_reader(MSWebCam *obj){
return ms_filter_new_from_desc(&ms_mire_desc);
}
MSWebCamDesc mire_desc={
MS2_VAR_PUBLIC MSWebCamDesc mire_desc={
"Mire",
&mire_detect,
&mire_cam_init,
......
......@@ -32,7 +32,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
static RtpProfile rtp_profile;
#ifdef _MSC_VER
extern __declspec(dllimport) MSWebCamDesc mire_desc;
#else
extern MSWebCamDesc mire_desc;
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment