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

get back to single-version ffmpeg wrapper (no more v2); make sure the library builds and the tests pass on Ubuntu 10.04 that includes pretty old version of ffmpeg

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-04-30 12:39:22 +00:00
parent 09ca294a76
commit 2c88791600
7 changed files with 832 additions and 2270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/highgui/test/test_video_io.cpp
View File

@@ -59,7 +59,7 @@ const VideoFormat g_specific_fmt_list[] =
VideoFormat("avi", CV_FOURCC('X', 'V', 'I', 'D')),
VideoFormat("avi", CV_FOURCC('M', 'P', 'E', 'G')),
VideoFormat("avi", CV_FOURCC('M', 'J', 'P', 'G')),
VideoFormat("avi", CV_FOURCC('I', 'Y', 'U', 'V')),
//VideoFormat("avi", CV_FOURCC('I', 'Y', 'U', 'V')),
VideoFormat("mkv", CV_FOURCC('X', 'V', 'I', 'D')),
VideoFormat("mkv", CV_FOURCC('M', 'P', 'E', 'G')),
VideoFormat("mkv", CV_FOURCC('M', 'J', 'P', 'G')),
@@ -225,9 +225,9 @@ void CV_HighGuiTest::ImageTest(const string& dir)
void CV_HighGuiTest::VideoTest(const string& dir, const cvtest::VideoFormat& fmt)
{
string src_file = dir + "../cv/shared/video_for_test.avi";
string tmp_name = format("video.%s", fmt.ext.c_str());
string tmp_name = format("video_%s.%s", cvtest::fourccToString(fmt.fourcc).c_str(), fmt.ext.c_str());
ts->printf(ts->LOG, "reading video : %s\n", src_file.c_str());
ts->printf(ts->LOG, "reading video : %s and converting it to %s\n", src_file.c_str(), tmp_name.c_str());
CvCapture* cap = cvCaptureFromFile(src_file.c_str());