Skip to content

Commit

Permalink
encoder/ffmpeg: Don't use hardware encoding for unsupported formats
Browse files Browse the repository at this point in the history
  • Loading branch information
Xaymar committed Oct 8, 2020
1 parent e754a1e commit dc311f5
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion source/encoders/encoder-ffmpeg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ ffmpeg_instance::ffmpeg_instance(obs_data_t* settings, obs_encoder_t* self, bool
if (is_hw) {
// Abort if user specified manual override.
if ((static_cast<AVPixelFormat>(obs_data_get_int(settings, KEY_FFMPEG_COLORFORMAT)) != AV_PIX_FMT_NONE)
|| (obs_data_get_int(settings, KEY_FFMPEG_GPU) != -1) || (obs_encoder_scaling_enabled(_self))) {
|| (obs_data_get_int(settings, KEY_FFMPEG_GPU) != -1) || (obs_encoder_scaling_enabled(_self))
|| (video_output_get_info(obs_encoder_video(_self))->format != VIDEO_FORMAT_NV12)) {
throw std::runtime_error(
"Selected settings prevent the use of hardware encoding, falling back to software.");
}
Expand Down

0 comments on commit dc311f5

Please sign in to comment.