opencv/modules/videoio
Alexander Alekhin 67a734ce73 Merge branch '2.4' into master
Commits:
67fe57a add fixed video
db0ae2c Restore 2.4 source branch for bug fix 6317.
97ac59c Fix a memory leak indirectly caused by cvDestroyWindow
eb40afa Add a workaround for FFmpeg's color conversion accessing past the end of the buffer
421fcf9 Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
912592d Remove "INSTALL_NAME_DIR lib" target property
bb1c2d7 fix bug on border at pyrUp
2016-04-21 20:15:08 +03:00
..
include/opencv2 ximea new param 2016-02-17 11:18:49 +01:00
misc/java/test Updated Manager for Android 2015-06-02 17:33:04 +03:00
perf Split highgui module to videoio and highgui 2014-07-14 23:16:47 +04:00
src Merge branch '2.4' into master 2016-04-21 20:15:08 +03:00
test Merge 2.4 into master 2015-12-08 10:24:54 +03:00
CMakeLists.txt - removed whitespaces 2016-01-25 13:13:13 +01:00