diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 5d0b0558bf..f847b29ee3 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -154,10 +154,27 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 return "mpegts";
             }
+            // For these need to find out the ffmpeg names
             if (string.Equals(container, "m2ts", StringComparison.OrdinalIgnoreCase))
             {
                 return null;
             }
+            if (string.Equals(container, "wmv", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
+            if (string.Equals(container, "vob", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
+            if (string.Equals(container, "mpg", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
+            if (string.Equals(container, "mpeg", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
 
             return container;
         }
@@ -1481,7 +1498,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     //inputModifier += " -noaccurate_seek";
                 }
 
-                if (!string.IsNullOrWhiteSpace(state.InputContainer))
+                if (!string.IsNullOrWhiteSpace(state.InputContainer) && state.VideoType == VideoType.VideoFile)
                 {
                     var inputFormat = GetInputFormat(state.InputContainer);
                     if (!string.IsNullOrWhiteSpace(inputFormat))
@@ -1490,7 +1507,8 @@ namespace MediaBrowser.Controller.MediaEncoding
                     }
                 }
 
-                if (state.RunTimeTicks.HasValue && string.IsNullOrWhiteSpace(encodingOptions.HardwareAccelerationType))
+                // Only do this for video files due to sometimes unpredictable codec names coming from BDInfo
+                if (state.RunTimeTicks.HasValue && string.IsNullOrWhiteSpace(encodingOptions.HardwareAccelerationType) && state.VideoType == VideoType.VideoFile)
                 {
                     foreach (var stream in state.MediaSource.MediaStreams)
                     {
diff --git a/SharedVersion.cs b/SharedVersion.cs
index ad698d41e5..f0f5c27b28 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,3 +1,3 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("3.2.4")]
+[assembly: AssemblyVersion("3.2.5")]