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		2015-06-09 15:53:08 +03:00
..
doc	squashed #823	2015-04-24 21:58:14 +02:00
include/opencv2	Revert support for audio	2015-05-08 12:06:03 -04:00
perf	Normalized file endings.	2013-08-21 18:59:25 +04:00
src	make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)	2015-06-09 15:53:08 +03:00
test	make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)	2015-06-09 15:53:08 +03:00
CMakeLists.txt	suppress -Wclobbered warning	2015-04-22 16:42:03 +03:00