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

deps/media-playback: Do not seek network streams

Browse Source 
Will cause avformat to lock up perpetually on av_read_frame.
This commit is contained in:
jp9000 2017-05-16 01:54:39 -07:00
parent a78daa8a1c
commit 3b091b1668
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -391,10 +391,13 @@ static bool mp_media_reset(mp_media_t *m)
? av_rescale_q(seek_pos, AV_TIME_BASE_Q, stream->time_base)
: seek_pos;
int ret = av_seek_frame(m->fmt, 0, seek_target, seek_flags);
if (ret < 0) {
blog(LOG_WARNING, "MP: Failed to seek: %s", av_err2str(ret));
return false;
if (!m->is_network) {
int ret = av_seek_frame(m->fmt, 0, seek_target, seek_flags);
if (ret < 0) {
blog(LOG_WARNING, "MP: Failed to seek: %s",
av_err2str(ret));
return false;
}
}
if (m->has_video && !m->is_network)