jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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).
This commit is contained in:
kc5nra
2015-04-26 17:31:21 -05:00
parent cd4d79075d
commit 5b97cfbbdd
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/obs-ffmpeg/obs-ffmpeg-output.c
View File

@@ -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->audio_codec = AV_CODEC_ID_AAC;
} 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) {