Jelajahi Sumber

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

This reverts commit 6071098abc48575a82f41b850b9c04fbaf570838.
jp9000 5 tahun lalu
induk
melakukan
db1e6aa192
1 mengubah file dengan 5 tambahan dan 1 penghapusan
  1. 5 1
      plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c

+ 5 - 1
plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c

@@ -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;
 		}