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

Merge pull request #2384 from LiamCoal/allow-no-buffering 

media-playback: Unbuffered Media Source
master
Jim 2020-05-21 17:40:08 -07:00 committed by GitHub
parent 770408a7da 2b7f4dfa6b
commit 9607a9f46e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deps/media-playback/media-playback/media.c vendored
View File

@ -583,6 +583,9 @@ static bool init_avformat(mp_media_t *m)
av_dict_set_int(&opts, "buffer_size", m->buffering, 0);
m->fmt = avformat_alloc_context();
if (m->buffering == 0) {
m->fmt->flags |= AVFMT_FLAG_NOBUFFER;
}
if (!m->is_local_file) {
m->fmt->interrupt_callback.callback = interrupt_callback;
m->fmt->interrupt_callback.opaque = m;

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

@ -163,7 +163,7 @@ static obs_properties_t *ffmpeg_source_getproperties(void *data)
obs_module_text("RestartWhenActivated"));
prop = obs_properties_add_int_slider(props, "buffering_mb",
obs_module_text("BufferingMB"), 1,
obs_module_text("BufferingMB"), 0,
16, 1);
obs_property_int_set_suffix(prop, " MB");