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

..

CMakeLists.txt

Merge branch '2.4' into master

2016-04-21 20:15:08 +03:00

opencv_annotation.cpp

vectorize process + enable early quitting/storage + enable delete annotion option

2016-04-13 10:20:18 +02:00