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

obs-ffmpeg: Fix error fetching properties from wrong pointer

Browse Source
This commit is contained in:
John Bradley
2015-03-10 12:18:19 -05:00
parent 89b7230652
commit 0e944735e0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/obs-ffmpeg/obs-ffmpeg-source.c
View File

@@ -331,18 +331,18 @@ static void ffmpeg_source_update(void *data, obs_data_t *settings)
char *input_format;
if (is_local_file) {
input = (char *)obs_data_get_string(data, "local_file");
input = (char *)obs_data_get_string(settings, "local_file");
input_format = NULL;
is_looping = obs_data_get_bool(data, "looping");
is_looping = obs_data_get_bool(settings, "looping");
} else {
input = (char *)obs_data_get_string(data, "input");
input_format = (char *)obs_data_get_string(data,
input = (char *)obs_data_get_string(settings, "input");
input_format = (char *)obs_data_get_string(settings,
"input_format");
is_looping = false;
}
s->is_forcing_scale = obs_data_get_bool(data, "force_scale");
s->is_hw_decoding = obs_data_get_bool(data, "hw_decode");
s->is_forcing_scale = obs_data_get_bool(settings, "force_scale");
s->is_hw_decoding = obs_data_get_bool(settings, "hw_decode");
if (s->demuxer != NULL)
ff_demuxer_free(s->demuxer);