potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-06-21 17:27:14 +03:00
parent e69ff71302 4b205680df
commit f33f88de31
10 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/videoio/src/cap_mfx_writer.cpp
+1 -1
View File
@@ -31,7 +31,7 @@ inline mfxU32 codecIdByFourCC(int fourcc)
}
VideoWriter_IntelMFX::VideoWriter_IntelMFX(const String &filename, int _fourcc, double fps, Size frameSize_, bool)
: session(0), plugin(0), deviceHandler(0), bs(0), encoder(0), pool(0), frameSize(frameSize_), good(false)
: session(0), plugin(0), deviceHandler(0), bs(0), encoder(0), pool(0), outSurface(NULL), frameSize(frameSize_), good(false)
{
mfxStatus res = MFX_ERR_NONE;