From 8a87e4226aa802d6a0e3566c66824fedf68e77da Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 24 十月 2023 16:30:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/mediamtx/ffmpeg.exe |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/lib/mediamtx/ffmpeg.exe b/server/mediamtx/ffmpeg.exe
similarity index 100%
rename from lib/mediamtx/ffmpeg.exe
rename to server/mediamtx/ffmpeg.exe
Binary files differ

--
Gitblit v1.9.3