Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
root = true

[*]
insert_final_newline = true
end_of_line = lf

[*.{md,cs}]
indent_style = space
indent_size = 4
charset = utf-8
24 changes: 24 additions & 0 deletions Documentation/Installation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@

# Installation

*How to setup this program.*

<br>

## Steps

<br>

1. **[Download]** a Release.

<br>

2. [Install **FFMPEG** & **FFPROBE**][FFMPEG]

<br>


<!----------------------------------------------------------------------------->

[Download]: https://github.com/NotBoogie/Stream-Video-Merger/releases
[FFMPEG]: https://www.wikihow.com/Install-FFmpeg-on-Windows
25 changes: 25 additions & 0 deletions Documentation/Usage.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@

# Usage

<br>

## Basics

Drag your **OBS** recordings onto the <br>
executable to have them combined.

<br>
<br>

## Settings

Control the resulting file type, as well as whether <br>
or not a zip / webm should be generated in your <br>

`settings.json` 

<br>

*This file will automatically be generated will default values.*

<br>
50 changes: 44 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,48 @@
# Stream-Video-Merger
Automates combining stream recordings into one long video and .zips it for you. Drag OBS recordings into .exe to create.

Control the result file type, zip, and webm generation in the settings.json file. settings.json will be created with default options on first execution (if one isn't found)
<br>

Requires FFMPEG.exe and FFPROBE.exe to be in your PATH. ( https://www.wikihow.com/Install-FFmpeg-on-Windows explains setup better than I could)
<div align = center>

Derivative of FUSER project.
![Badge .Net]   
![Badge Based]

Runs on .net 5.0
<br>

# Stream Video Merger

*Automates combining stream recordings* <br>
*into one long video, as well as zipping it.*

<br>
<br>

[![Button Download]][Download]

[![Button Install]][Install]

[![Button Usage]][Usage]

</div>

<br>


<!----------------------------------------------------------------------------->

[Download]: https://github.com/NotBoogie/Stream-Video-Merger/releases

[Install]: Documentation/Installation.md
[Usage]: Documentation/Usage.md


<!---------------------------------[ Badges ]---------------------------------->

[Badge Based]: https://img.shields.io/badge/Based_On-FUSER-415986?style=for-the-badge&logoColor=white&labelColor=5879b5&logo=Puppet
[Badge .Net]: https://img.shields.io/badge/-5.0-418643?style=for-the-badge&logoColor=white&labelColor=53AC56&logo=.NET


<!---------------------------------[ Buttons ]--------------------------------->

[Button Download]: https://img.shields.io/badge/Download-b51d5a?style=for-the-badge&logoColor=white&logo=DocuSign
[Button Install]: https://img.shields.io/badge/Installation-5879b5?style=for-the-badge&logoColor=white&logo=GitBook
[Button Usage]: https://img.shields.io/badge/Usage-53ac56?style=for-the-badge&logoColor=white&logo=BookStack