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

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

Browse Source 
This reverts commit 6071098abc48575a82f41b850b9c04fbaf570838.
This commit is contained in:
jp9000 2020-11-18 14:28:06 -08:00
parent 33dc4108fe
commit db1e6aa192
1 changed files with 5 additions and 1 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,11 +857,15 @@ int main(int argc, char *argv[])
return ret;
}
bool is_network = ffmpeg_mux_is_network(&ffm);
while (!fail && safe_read(&info, sizeof(info)) == sizeof(info)) {
resize_buf_resize(&rb, info.size);
if (safe_read(rb.buf, info.size) == info.size) {
fail = ffmpeg_mux_packet(&ffm, rb.buf, &info);
bool packet_fail =
ffmpeg_mux_packet(&ffm, rb.buf, &info);
fail = is_network && packet_fail;
} else {
fail = true;
}