2
0
Эх сурвалжийг харах

Merge pull request #10135 from 0x25CBFC4F/fix/ffmpeg-probesize

Fixed probesize argument passing to FFmpeg
Claus Vium 1 жил өмнө
parent
commit
6593aa1255

+ 1 - 0
CONTRIBUTORS.md

@@ -238,3 +238,4 @@
  - [Jakob Kukla](https://github.com/jakobkukla)
  - [Utku Özdemir](https://github.com/utkuozdemir)
  - [JPUC1143](https://github.com/Jpuc1143/)
+ - [0x25CBFC4F](https://github.com/0x25CBFC4F)

+ 8 - 1
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -5690,7 +5690,6 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             // Apply -analyzeduration as per the environment variable,
             // otherwise ffmpeg will break on certain files due to default value is 0.
-            // The default value of -probesize is more than enough, so leave it as is.
             var ffmpegAnalyzeDuration = _config.GetFFmpegAnalyzeDuration() ?? string.Empty;
 
             if (state.MediaSource.AnalyzeDurationMs > 0)
@@ -5709,6 +5708,14 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             inputModifier = inputModifier.Trim();
 
+            // Apply -probesize if configured
+            var ffmpegProbeSize = _config.GetFFmpegProbeSize();
+
+            if (!string.IsNullOrEmpty(ffmpegProbeSize))
+            {
+                inputModifier += $" -probesize {ffmpegProbeSize}";
+            }
+
             var userAgentParam = GetUserAgentParam(state);
 
             if (!string.IsNullOrEmpty(userAgentParam))