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

obs-ffmpeg: Treat errors as fatal for non-network streams in ffmpeg-mux

Browse Source
This commit is contained in:
Eric Lindvall 2020-11-15 14:33:36 -08:00 committed by Jim
parent 315fbd6f33
commit 6071098abc
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c
View File

@ -857,15 +857,11 @@ int main(int argc, char *argv[])
return ret; return ret;
} }
bool is_network = ffmpeg_mux_is_network(&ffm);
while (!fail && safe_read(&info, sizeof(info)) == sizeof(info)) { while (!fail && safe_read(&info, sizeof(info)) == sizeof(info)) {
resize_buf_resize(&rb, info.size); resize_buf_resize(&rb, info.size);
if (safe_read(rb.buf, info.size) == info.size) { if (safe_read(rb.buf, info.size) == info.size) {
bool packet_fail = fail = ffmpeg_mux_packet(&ffm, rb.buf, &info);
ffmpeg_mux_packet(&ffm, rb.buf, &info);
fail = is_network && packet_fail;
} else { } else {
fail = true; fail = true;
} }