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

2012-04-30 12:39:22 +00:00
parent 09ca294a76
commit 2c88791600
7 changed files with 832 additions and 2270 deletions
--- a/modules/highgui/test/test_framecount.cpp
+++ b/modules/highgui/test/test_framecount.cpp
@@ -57,7 +57,7 @@ void CV_FramecountTest::run(int)
 {
    const int time_sec = 5, fps = 25;

-    const string ext[] = {"avi", "mov", "mp4", "mpg", "wmv"};
+    const string ext[] = {"avi", "mov", "mp4"};

    const size_t n = sizeof(ext)/sizeof(ext[0]);