Vadim Pisarevsky
|
799622affd
|
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
(cherry picked from commit 2b2e3ee93c )
Conflicts:
cmake/OpenCVFindLibsVideo.cmake
modules/videoio/src/cap.cpp
modules/videoio/src/cap_ffmpeg_impl.hpp
modules/videoio/src/ffmpeg_codecs.hpp
modules/videoio/test/test_ffmpeg.cpp
|
10 years ago |
Roman Donchenko
|
d3af86c0ea
|
Added the missing setting of HAVE_FFMPEG to true on Windows.
While the FFmpeg video IO backend gets compiled even without it,
the tests (for both FFmpeg and video IO) don't. This should fix
that.
|
12 years ago |
Roman Donchenko
|
5e24376ad7
|
Updated ffmpeg_vesion.cmake after #1516.
|
12 years ago |
Roman Donchenko
|
e9a28f66ee
|
Normalized file endings.
|
12 years ago |
Roman Donchenko
|
eb8d9730cb
|
Removed unused NEW_FFMPEG macro.
|
12 years ago |
OpenCV Buildbot
|
04384a71e4
|
Normalize line endings and whitespace
|
13 years ago |
Vadim Pisarevsky
|
2fd1e2ea57
|
merged all the latest changes from 2.4 to trunk
|
13 years ago |
Andrey Kamaev
|
935222c58f
|
ffmpeg version info for Windows
|
13 years ago |