xaymar/obs-ffmpeg-encoder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

encoder: Fix crash because of missing string parameter

Browse Source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2019-11-16 21:19:17 +01:00
parent 65dddb5aa8
commit a0bfac9319
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/encoder.cpp
+4 -4
View File
@@ -696,7 +696,7 @@ void obsffmpeg::encoder::initialize_hw(obs_data_t*)
_context->framerate.den = _context->time_base.num = voi->fps_den; _context->framerate.den = _context->time_base.num = voi->fps_den;
ffmpeg::tools::setup_obs_color(voi->colorspace, voi->range, _context); ffmpeg::tools::setup_obs_color(voi->colorspace, voi->range, _context);
_context->sw_pix_fmt = ffmpeg::tools::obs_videoformat_to_avpixelformat(voi->format); _context->sw_pix_fmt = ffmpeg::tools::obs_videoformat_to_avpixelformat(voi->format);
#ifdef WIN32 #ifdef WIN32
_context->pix_fmt = AV_PIX_FMT_D3D11; _context->pix_fmt = AV_PIX_FMT_D3D11;
#endif #endif
@@ -972,10 +972,10 @@ bool obsffmpeg::encoder::update(obs_data_t* settings)
PLOG_INFO("[%s] Keyframes: ", _codec->name); PLOG_INFO("[%s] Keyframes: ", _codec->name);
if (_context->keyint_min != _context->gop_size) { if (_context->keyint_min != _context->gop_size) {
PLOG_INFO("[%s] Minimum: %i frames", _context->keyint_min); PLOG_INFO("[%s] Minimum: %i frames", _codec->name, _context->keyint_min);
PLOG_INFO("[%s] Maximum: %i frames", _context->gop_size); PLOG_INFO("[%s] Maximum: %i frames", _codec->name, _context->gop_size);
} else { } else {
PLOG_INFO("[%s] Distance: %i frames", _context->gop_size); PLOG_INFO("[%s] Distance: %i frames", _codec->name, _context->gop_size);
} }
_handler->log_options(settings, _codec, _context); _handler->log_options(settings, _codec, _context);
} }