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

..

doc

Normalized file endings.

2013-08-21 18:59:25 +04:00

include/opencv2/highgui

Normalized file endings.

2013-08-21 18:59:25 +04:00

perf

Normalized file endings.

2013-08-21 18:59:25 +04:00

src

Merge pull request #1459 from asmorkalov:ocv_qt_segflt_fix

2013-10-18 18:39:08 +04:00

test

Changed MPEG-2 resolution in the FFmpeg test.

2013-10-25 14:31:27 +04:00

CMakeLists.txt

update cmake 'install' target for Windows platform

2013-10-09 17:49:10 +04:00