mirror of
https://github.com/opencv/opencv.git
synced 2026-07-30 15:53:03 +04:00
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
This commit is contained in:
committed by
Roman Donchenko
parent
83ace8d580
commit
799622affd
@@ -132,6 +132,7 @@ public:
|
||||
writer << img;
|
||||
}
|
||||
|
||||
writer.release();
|
||||
if (!created) created = true;
|
||||
else remove(filename.c_str());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user