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

merged the latest fixes in 2.3 to trunk

Browse Source
This commit is contained in:
Vadim Pisarevsky
2011-07-04 16:18:12 +00:00
parent 55ba0af2bc
commit b33224f0b6
29 changed files with 1930 additions and 2943 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/highgui/src/cap.cpp
View File

@@ -283,16 +283,9 @@ CV_IMPL CvCapture * cvCreateFileCapture (const char * filename)
{
CvCapture * result = 0;
#ifdef WIN32
if (! result)
result = cvCreateFileCapture_Win32 (filename);
#endif
result = cvCreateFileCapture_FFMPEG_proxy (filename);
#ifdef HAVE_FFMPEG
if (! result)
result = cvCreateFileCapture_FFMPEG (filename);
#endif
#ifdef HAVE_XINE
if (! result)
result = cvCreateFileCapture_XINE (filename);
@@ -328,20 +321,14 @@ CV_IMPL CvVideoWriter* cvCreateVideoWriter( const char* filename, int fourcc,
if(!fourcc || !fps)
result = cvCreateVideoWriter_Images(filename);
#ifdef WIN32
if(!result)
result = cvCreateVideoWriter_Win32(filename, fourcc, fps, frameSize, is_color);
#endif
result = cvCreateVideoWriter_FFMPEG_proxy (filename, fourcc, fps, frameSize, is_color);
/* #ifdef HAVE_XINE
if(!result)
result = cvCreateVideoWriter_XINE(filename, fourcc, fps, frameSize, is_color);
#endif
*/
#ifdef HAVE_FFMPEG
if(!result)
result = cvCreateVideoWriter_FFMPEG(filename, fourcc, fps, frameSize, is_color);
#endif
#ifdef HAVE_QUICKTIME
if(!result)