Alexander Alekhin 3ee90a1ff4 ffmpeg: install both 32/64-bit versions (required for java/python 32/64-bit bindings)

2015-12-18 15:59:02 +03:00

..

include/opencv2

change links from samples/python2 to samples/python

2015-12-18 11:00:30 +03:00

misc/java/test

…

perf

…

src

merge Win10/VS2015 changes

2015-12-17 21:15:59 +01:00

test

Merge 2.4 into master

2015-12-08 10:24:54 +03:00

CMakeLists.txt

ffmpeg: install both 32/64-bit versions (required for java/python 32/64-bit bindings)

2015-12-18 15:59:02 +03:00