added mediaroot

2025-06-09 10:34:17 +00:00 · 2022-05-13 14:58:53 +02:00 · 2022-05-13 14:58:53 +02:00 · 82e44bea14
commit 82e44bea14
parent d5d90a01a1
1 changed files with 0 additions and 7 deletions
--- a/packages/streaming-server/src/index.js
+++ b/packages/streaming-server/src/index.js
@ -30,15 +30,8 @@ const MediaServerConfig = {
        ping: 30,
        ping_timeout: 60
    },
-<<<<<<< HEAD
    //logType: 0,
    mediaroot: path.resolve(process.cwd(), "./cache"),
-=======
-    http: {
-        port: 1000,
-        allow_origin: "*"
-    },
->>>>>>> c11505bacf345ac8b0e7799a04f90daa6922556a
    trans: {
        ffmpeg: ffmpeg.path,
        tasks: [