generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests 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
commit 6b09ada5d4
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
3rdparty/ffmpeg/ffmpeg.cmake vendored
View File

@ -1,9 +1,9 @@
# Binary branch name: ffmpeg/master_20150703 # Binary branch name: ffmpeg/master_20160715
# Binaries were created for OpenCV: e379ea6ed60b0caad4d4e3eea096e9d850cb8c86 # Binaries were created for OpenCV: 0e6aa189cb9a9642b0ae7983d301693516faad5d
set(FFMPEG_BINARIES_COMMIT "8aeefc4efe3215de89d8c7e114ae6f7a6091b8eb") set(FFMPEG_BINARIES_COMMIT "7eef9080d3271c7547d303fa839a62e1124ff1e6")
set(FFMPEG_FILE_HASH_BIN32 "89c783eee1c47bfc733f08334ec2e31c") set(FFMPEG_FILE_HASH_BIN32 "3bb2a8388af90adf6c762210e696400d")
set(FFMPEG_FILE_HASH_BIN64 "35fe6ccdda6d7a04e9056b0d73b98e76") set(FFMPEG_FILE_HASH_BIN64 "ebcfc963f0a94f7e83d58d60eaf23849")
set(FFMPEG_FILE_HASH_CMAKE "8606f947a780071f8fcce8cbf39ceef5") set(FFMPEG_FILE_HASH_CMAKE "f99941d10c1e87bf16b9055e8fc91ab2")
set(FFMPEG_DOWNLOAD_URL ${OPENCV_FFMPEG_URL};$ENV{OPENCV_FFMPEG_URL};https://raw.githubusercontent.com/opencv/opencv_3rdparty/${FFMPEG_BINARIES_COMMIT}/ffmpeg/) set(FFMPEG_DOWNLOAD_URL ${OPENCV_FFMPEG_URL};$ENV{OPENCV_FFMPEG_URL};https://raw.githubusercontent.com/opencv/opencv_3rdparty/${FFMPEG_BINARIES_COMMIT}/ffmpeg/)

3
modules/videoio/test/test_ffmpeg.cpp
View File

@ -118,6 +118,9 @@ public:
frame_s = Size(352, 288); frame_s = Size(352, 288);
else if( tag == VideoWriter::fourcc('H', '2', '6', '3') ) else if( tag == VideoWriter::fourcc('H', '2', '6', '3') )
frame_s = Size(704, 576); 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') || /*else if( tag == CV_FOURCC('M', 'J', 'P', 'G') ||
tag == CV_FOURCC('j', 'p', 'e', 'g') ) tag == CV_FOURCC('j', 'p', 'e', 'g') )
frame_s = Size(1920, 1080);*/ frame_s = Size(1920, 1080);*/