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

obs-ffmpeg: Treat non-network errors as fatal too 

4f873376 as part of PR #3460 changed ffmpeg_mux_packet to
fail = !ffmpeg_mux_packet. ffe4c855 only reverted that one line
instead of the entire previous commit. When the change was
reintroduced in 6071098a as part of PR #3740, it became
fail = ffmpeg_mux_packet without the negation.

This commit reverts db1e6aa and fixes the logic check.
master
Richard Stanway 2020-11-19 01:11:45 +01:00
parent db1e6aa192
commit 17b3873578
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;
}
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) {
bool packet_fail =
ffmpeg_mux_packet(&ffm, rb.buf, &info);
fail = is_network && packet_fail;
fail = !ffmpeg_mux_packet(&ffm, rb.buf, &info);
} else {
fail = true;
}