merge: resolve Dockerfile conflict (kept optimization + nvenc support)

bin/server.dart

@@ -181,7 +181,8 @@ void main(List<String> args) async {
         final user = req.context['user'] as User?;
         if (user == null || !user.isAdmin) {
           return Response.forbidden(
-              jsonEncode({'error': 'Admin access required'}));
+            jsonEncode({'error': 'Admin access required'}),
+          );
         }
 
         final result = await cleanupService.runCleanup();
@@ -231,8 +232,20 @@ void main(List<String> args) async {
 
   // Create Streaming Router (Mount handlers on correct paths)
   final streamingRouter = Router()
-    ..mount('/api/live', createLiveStreamHandler(getPlaylist))
-    ..mount('/api/vod', createVodStreamHandler(getPlaylist));
+    ..mount(
+      '/api/live',
+      createLiveStreamHandler(
+        getPlaylist,
+        isGpuEnabled: db.isNvidiaGpuEnabled,
+      ),
+    )
+    ..mount(
+      '/api/vod',
+      createVodStreamHandler(
+        getPlaylist,
+        isGpuEnabled: db.isNvidiaGpuEnabled,
+      ),
+    );
 
   // Secured Proxy Pipeline
   // We handle it outside the main router to preserve the '/api/xtream' prefix