Răsfoiți Sursa

obs-ffmpeg: Only set codec ids if format non-null

In the settings if you select default container then the
format becomes null.  If null then audio/video codec ids should
not be set on the output format as they will both be
AV_CODEC_ID_NONE causing a context with no streams specified
to be created (error).
kc5nra 10 ani în urmă
părinte
comite
5b97cfbbdd
1 a modificat fișierele cu 6 adăugiri și 4 ștergeri
  1. 6 4
      plugins/obs-ffmpeg/obs-ffmpeg-output.c

+ 6 - 4
plugins/obs-ffmpeg/obs-ffmpeg-output.c

@@ -458,10 +458,12 @@ static bool ffmpeg_data_init(struct ffmpeg_data *data,
 		data->output->oformat->video_codec = AV_CODEC_ID_H264;
 		data->output->oformat->video_codec = AV_CODEC_ID_H264;
 		data->output->oformat->audio_codec = AV_CODEC_ID_AAC;
 		data->output->oformat->audio_codec = AV_CODEC_ID_AAC;
 	} else {
 	} else {
-		data->output->oformat->video_codec =
-				data->config.video_encoder_id;
-		data->output->oformat->audio_codec =
-				data->config.audio_encoder_id;
+		if (data->config.format_name) {
+			data->output->oformat->video_codec =
+					data->config.video_encoder_id;
+			data->output->oformat->audio_codec =
+					data->config.audio_encoder_id;
+		}
 	}
 	}
 
 
 	if (!data->output) {
 	if (!data->output) {