Changed MPEG-2 resolution in the FFmpeg test.
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 25 Oct 2013 10:31:27 +0000 (14:31 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Fri, 25 Oct 2013 10:31:27 +0000 (14:31 +0400)
commit5a5d569d722de28fe1f5e46c21826f7876a28ded
treec7016bdcca55aac91dacfaccf24103e262f54eeb
parent260c2e0b08b07c9d1c9d615239fa6232e271d412
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 424a7b0ab0cf7da591f7f15fbd15b2fee8c84a41)

Conflicts:
modules/highgui/test/test_ffmpeg.cpp
modules/highgui/test/test_ffmpeg.cpp