potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages 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
modules/highgui/src/cap_ffmpeg.cpp
-4
View File
@@ -42,11 +42,7 @@
#include "precomp.hpp"
#ifdef HAVE_FFMPEG
#ifdef NEW_FFMPEG
#include "cap_ffmpeg_impl_v2.hpp"
#else
#include "cap_ffmpeg_impl.hpp"
#endif
#else
#include "cap_ffmpeg_api.hpp"
#endif