opencv/modules
Roman Donchenko 5a5d569d72 Changed MPEG-2 resolution in the FFmpeg test.
Newer FFmpeg prohibits 4096x4096 MPEG-2, presumably because it violates
the standard.

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commit;h=7fb87bc5f24b1be13269109506c05e4c54695b5e

(cherry picked from commit 424a7b0ab0)

Conflicts:
	modules/highgui/test/test_ffmpeg.cpp
2013-10-25 14:31:27 +04:00
..
androidcamera Native camera libraries updated. 2013-08-29 18:46:45 +04:00
calib3d Change intrinsic camera matrix initialization 2013-10-19 02:10:20 -05:00
contrib Merge pull request #1369 from StevenPuttemans:fix_featuretracker 2013-10-17 15:42:38 +04:00
core OpenCV 2.4.6.2 (Tegra detection and native camera update) 2013-10-17 17:19:04 +04:00
features2d remove CV_EXPORT from templates 2013-09-15 13:48:54 +04:00
flann Silenced a few -Wcast-align warnings in the headers. 2013-09-12 12:33:56 +04:00
gpu added missing gpu::matchTemplate implementation for non-CUDA build 2013-09-09 10:51:44 +04:00
highgui Changed MPEG-2 resolution in the FFmpeg test. 2013-10-25 14:31:27 +04:00
imgproc misprint 2013-10-19 22:59:47 +04:00
java cmake: fix linker dependencies for opencv_java 2013-10-24 19:04:59 +04:00
legacy Android NDK r9 support. x64 NDK support fix for MacOS X. 2013-10-03 11:36:12 +04:00
ml svm: disable failed tests 2013-10-07 18:17:10 +04:00
nonfree ocl: remove support_image2d(): we target on OpenCL 1.1 (with image2d support by default) 2013-10-11 17:16:03 +04:00
objdetect Normalized file endings. 2013-08-21 18:59:25 +04:00
ocl Merge pull request #1682 from SpecLad:Wmissing-declarations 2013-10-24 22:19:17 +04:00
photo Normalized file endings. 2013-08-21 18:59:25 +04:00
python cmake: python module updates 2013-10-09 17:49:11 +04:00
stitching Normalized file endings. 2013-08-21 18:59:25 +04:00
superres ocl: move program names into opencl_kernels.hpp 2013-10-03 19:50:14 +04:00
ts Fix running Java tests with run.py on everything other than Windows. 2013-10-16 19:22:01 +04:00
video Normalized file endings. 2013-08-21 18:59:25 +04:00
videostab Normalized file endings. 2013-08-21 18:59:25 +04:00
world Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
CMakeLists.txt
refman.rst.in