potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 08:13:04 +04:00
Code Packages Releases Wiki Activity

Merge pull request #6899 from alalek:ffmpeg_update

Browse Source
This commit is contained in:
Vadim Pisarevsky
2016-07-21 07:31:11 +00:00
parent 167a4e6592 daf1879a2e
commit 6b09ada5d4
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/test/test_ffmpeg.cpp
+3
View File
@@ -118,6 +118,9 @@ public:
frame_s = Size(352, 288);
else if( tag == VideoWriter::fourcc('H', '2', '6', '3') )
frame_s = Size(704, 576);
else if( tag == VideoWriter::fourcc('H', '2', '6', '4') )
// OpenH264 1.5.0 has resolution limitations, so lets use DCI 4K resolution
frame_s = Size(4096, 2160);
/*else if( tag == CV_FOURCC('M', 'J', 'P', 'G') ||
tag == CV_FOURCC('j', 'p', 'e', 'g') )
frame_s = Size(1920, 1080);*/