1
0
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:
Vadim Pisarevsky
2015-04-22 21:57:29 +03:00
committed by Roman Donchenko
parent 83ace8d580
commit 799622affd
6 changed files with 231 additions and 139 deletions
+1
View File
@@ -132,6 +132,7 @@ public:
writer << img;
}
writer.release();
if (!created) created = true;
else remove(filename.c_str());
}