Commit a31ad531 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

fix build on Linux/Mac

parent 8bd792d7
...@@ -114,15 +114,15 @@ icvInitFFMPEG(void) ...@@ -114,15 +114,15 @@ icvInitFFMPEG(void)
#endif #endif
} }
#elif defined HAVE_FFMPEG #elif defined HAVE_FFMPEG
icvCreateFileCapture_FFMPEG_p = cvCreateFileCapture_FFMPEG; icvCreateFileCapture_FFMPEG_p = (CvCreateFileCapture_Plugin)cvCreateFileCapture_FFMPEG;
icvReleaseCapture_FFMPEG_p = cvReleaseCapture_FFMPEG; icvReleaseCapture_FFMPEG_p = (CvReleaseCapture_Plugin)cvReleaseCapture_FFMPEG;
icvGrabFrame_FFMPEG_p = cvGrabFrame_FFMPEG; icvGrabFrame_FFMPEG_p = (CvGrabFrame_Plugin)cvGrabFrame_FFMPEG;
icvRetrieveFrame_FFMPEG_p = cvRetrieveFrame_FFMPEG; icvRetrieveFrame_FFMPEG_p = (CvRetrieveFrame_Plugin)cvRetrieveFrame_FFMPEG;
icvSetCaptureProperty_FFMPEG_p = cvSetCaptureProperty_FFMPEG; icvSetCaptureProperty_FFMPEG_p = (CvSetCaptureProperty_Plugin)cvSetCaptureProperty_FFMPEG;
icvGetCaptureProperty_FFMPEG_p = cvGetCaptureProperty_FFMPEG; icvGetCaptureProperty_FFMPEG_p = (CvGetCaptureProperty_Plugin)cvGetCaptureProperty_FFMPEG;
icvCreateVideoWriter_FFMPEG_p = cvCreateVideoWriter_FFMPEG; icvCreateVideoWriter_FFMPEG_p = (CvCreateVideoWriter_Plugin)cvCreateVideoWriter_FFMPEG;
icvReleaseVideoWriter_FFMPEG_p = cvReleaseVideoWriter_FFMPEG; icvReleaseVideoWriter_FFMPEG_p = (CvReleaseVideoWriter_Plugin)cvReleaseVideoWriter_FFMPEG;
icvWriteFrame_FFMPEG_p = cvWriteFrame_FFMPEG; icvWriteFrame_FFMPEG_p = (CvWriteFrame_Plugin)cvWriteFrame_FFMPEG;
#endif #endif
ffmpegInitialized = 1; ffmpegInitialized = 1;
...@@ -190,7 +190,11 @@ CvCapture* cvCreateFileCapture_FFMPEG_proxy(const char * filename) ...@@ -190,7 +190,11 @@ CvCapture* cvCreateFileCapture_FFMPEG_proxy(const char * filename)
if( result->open( filename )) if( result->open( filename ))
return result; return result;
delete result; delete result;
#if defined WIN32 || defined _WIN32
return cvCreateFileCapture_VFW(filename); return cvCreateFileCapture_VFW(filename);
#else
return 0;
#endif
} }
...@@ -240,6 +244,9 @@ CvVideoWriter* cvCreateVideoWriter_FFMPEG_proxy( const char* filename, int fourc ...@@ -240,6 +244,9 @@ CvVideoWriter* cvCreateVideoWriter_FFMPEG_proxy( const char* filename, int fourc
if( result->open( filename, fourcc, fps, frameSize, isColor != 0 )) if( result->open( filename, fourcc, fps, frameSize, isColor != 0 ))
return result; return result;
delete result; delete result;
#if defined WIN32 || defined _WIN32
return cvCreateVideoWriter_VFW(filename, fourcc, fps, frameSize, isColor); return cvCreateVideoWriter_VFW(filename, fourcc, fps, frameSize, isColor);
#else
return 0;
#endif
} }
...@@ -8,6 +8,8 @@ extern "C" ...@@ -8,6 +8,8 @@ extern "C"
#if defined WIN32 || defined _WIN32 #if defined WIN32 || defined _WIN32
#define OPENCV_FFMPEG_API __declspec(dllexport) #define OPENCV_FFMPEG_API __declspec(dllexport)
#else
#define OPENCV_FFMPEG_API
#endif #endif
enum enum
......
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