generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Multiple Windows RT fixes

Browse Source 
TIFF build was fixed;
Direct Show back-end was enabled;
More accurate guards implemented.
This commit is contained in:
Alexander Smorkalov
2013-03-19 17:46:01 -07:00
parent 06aff4e7b0
commit 3d594c70ff
7 changed files with 54 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
modules/highgui/src/cap_ffmpeg.cpp
View File

@@ -209,11 +209,11 @@ CvCapture* cvCreateFileCapture_FFMPEG_proxy(const char * filename)
if( result->open( filename ))
return result;
delete result;
//#if defined WIN32 || defined _WIN32
// return cvCreateFileCapture_VFW(filename);
//#else
#if (defined WIN32 || defined _WIN32) && !defined _M_ARM
return cvCreateFileCapture_VFW(filename);
#else
return 0;
//#endif
#endif
}
class CvVideoWriter_FFMPEG_proxy :
@@ -263,9 +263,9 @@ CvVideoWriter* cvCreateVideoWriter_FFMPEG_proxy( const char* filename, int fourc
if( result->open( filename, fourcc, fps, frameSize, isColor != 0 ))
return result;
delete result;
// #if defined WIN32 || defined _WIN32
// return cvCreateVideoWriter_VFW(filename, fourcc, fps, frameSize, isColor);
// #else
#if (defined WIN32 || defined _WIN32) && !defined _M_ARM
return cvCreateVideoWriter_VFW(filename, fourcc, fps, frameSize, isColor);
#else
return 0;
//#endif
#endif
}