They don't actually do anything. And even if they did, all components are
enabled by default, anyway.
(cherry picked from commit 49fe496914)
Conflicts:
cmake/OpenCVPackaging.cmake
FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.
(cherry picked from commit 77578d415f)
Conflicts:
modules/highgui/src/cap_ffmpeg_impl.hpp
modules/videoio/src/cap_gstreamer.cpp:577:31: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
filename = "v4lsrc ! "COLOR_ELEM" ! appsink";
^
modules/videoio/src/cap_gstreamer.cpp:585:32: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
filename = "v4l2src ! "COLOR_ELEM" ! appsink";
(use "git reset HEAD <file>..." to unstage)
modified: modules/java/generator/gen_java.py
modified: modules/videoio/include/opencv2/videoio.hpp
modified: modules/videoio/include/opencv2/videoio/videoio_c.h
modified: modules/videoio/src/cap_dshow.cpp
modified: modules/videoio/src/cap_pvapi.cpp
Following changes have been made:
1. Some minor bugs have been removed.
2. In the PvAPI module the option CAP_PROP_MONOCROME has been removed because
this option does not make sense and causes an error if a color camera is used.
3. Instead the new option CAP_PROP_PVAPI_PIXELFORMAT has been added which allows
to activate the different pixel formats (color modes) of an AVT camera.
4. Since there were two identical defines
CAP_PROP_MONOCROME = 19
CAP_PROP_MONOCHROME = 19
which were also used in the other module DSHOW, the first one with an orthographic
error has been removed in favor of the second one.
- note: uses VFPv3 instructions
- also added overloaded cvRound variants with float and int parameters
- thanks to Marina Kolpakova from Itseez for idea
- thanks to developers from #llvm IRC channel for help with inline asm
