From 5a5d569d722de28fe1f5e46c21826f7876a28ded Mon Sep 17 00:00:00 2001
From: Roman Donchenko <roman.donchenko@itseez.com>
Date: Fri, 25 Oct 2013 14:31:27 +0400
Subject: [PATCH] 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 | 3 +++
1 file changed, 3 insertions(+)
diff --git a/modules/highgui/test/test_ffmpeg.cpp b/modules/highgui/test/test_ffmpeg.cpp
index 59e7bc58d..9ef415b77 100644
--- a/modules/highgui/test/test_ffmpeg.cpp
+++ b/modules/highgui/test/test_ffmpeg.cpp
@@ -104,7 +104,10 @@ public:
frame_s = Size(1920, 1080);*/
if( tag == CV_FOURCC('M', 'P', 'E', 'G') )
+ {
+ frame_s = Size(720, 576);
fps = 25;
+ }
VideoWriter writer(filename, tag, fps, frame_s);