merged the latest fixes in 2.3 to trunk
authorVadim Pisarevsky <no@email>
Mon, 4 Jul 2011 16:18:12 +0000 (16:18 +0000)
committerVadim Pisarevsky <no@email>
Mon, 4 Jul 2011 16:18:12 +0000 (16:18 +0000)
commitb33224f0b6149191741966a0313733ac6686bb15
tree3551fc10a14640c867ee8e88e7d8fc3a5e5bb9bb
parent55ba0af2bcb33bcc26194997894b57b6da9bca83
merged the latest fixes in 2.3 to trunk
29 files changed:
3rdparty/CMakeLists.txt
3rdparty/ffmpeg/CMakeLists.txt [new file with mode: 0644]
3rdparty/ffmpeg/ffopencv.c [new file with mode: 0644]
3rdparty/ffmpeg/make.bat [new file with mode: 0644]
3rdparty/ffmpeg/opencv_ffmpeg.dll [new file with mode: 0644]
3rdparty/ffmpeg/opencv_ffmpeg_64.dll [new file with mode: 0644]
3rdparty/ffmpeg/readme.txt [new file with mode: 0644]
CMakeLists.txt
Package.cmake.in
doc/opencv2refman.pdf
doc/opencv_tutorials.pdf
doc/opencv_user.pdf
modules/CMakeLists.txt
modules/core/doc/old_basic_structures.rst
modules/ffmpeg/CMakeLists.txt [deleted file]
modules/ffmpeg/ffopencv.cpp [deleted file]
modules/ffmpeg/ffopencv.h [deleted file]
modules/highgui/CMakeLists.txt
modules/highgui/src/cap.cpp
modules/highgui/src/cap_ffmpeg.cpp
modules/highgui/src/cap_ffmpeg_api.hpp [new file with mode: 0644]
modules/highgui/src/cap_ffmpeg_impl.hpp [new file with mode: 0644]
modules/highgui/src/cap_w32.cpp [deleted file]
modules/highgui/src/precomp.hpp
modules/imgproc/doc/feature_detection.rst
modules/imgproc/doc/histograms.rst
modules/imgproc/doc/miscellaneous_transformations.rst
modules/imgproc/doc/planar_subdivisions.rst
modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst