Merge branch 'main' of github.com:koush/scrypted

koush · Jan 4, 2025 · 93ad50d · 93ad50d
2 parents 427139e + b110039
commit 93ad50d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/common/src/ffmpeg-hardware-acceleration.ts b/common/src/ffmpeg-hardware-acceleration.ts
@@ -70,11 +70,7 @@ export function getH264DecoderArgs(): CodecArgs {
         ],
     };
 
-    if (isRaspberryPi()) {
-        ret['Raspberry Pi'] = ['-c:v', 'h264_mmal'];
-        ret[V4L2] = ['-c:v', 'h264_v4l2m2m'];
-    }
-    else if (os.platform() === 'linux') {
+    if (os.platform() === 'linux') {
         ret[V4L2] = ['-c:v', 'h264_v4l2m2m'];
     }
     else if (os.platform() === 'win32') {

diff --git a/server/src/scrypted-cluster-main.ts b/server/src/scrypted-cluster-main.ts
@@ -371,6 +371,7 @@ export function createClusterServer(mainFilename: string, scryptedRuntime: Scryp
                 console.log('Cluster client authenticated.', socket.remoteAddress, socket.remotePort, properties);
             }
             catch (e) {
+                console.error('Cluster client authentication failed.', socket.remoteAddress, socket.remotePort, e);
                 peer.kill(e);
                 socket.destroy();
             }