From 71308b5c29da6506bc294a6b4eb1f4a5b86ce0bd Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Tue, 27 Jun 2017 16:56:47 -0400 Subject: [PATCH] fix -tp format command line --- MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 4 ++++ SharedVersion.cs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 60583b95bf..44bdafc5b2 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -201,6 +201,10 @@ namespace MediaBrowser.Controller.MediaEncoding { return null; } + if (string.Equals(container, "tp", StringComparison.OrdinalIgnoreCase)) + { + return null; + } // Seeing reported failures here, not sure yet if this is related to specfying input format if (string.Equals(container, "m4v", StringComparison.OrdinalIgnoreCase)) diff --git a/SharedVersion.cs b/SharedVersion.cs index 54c495e321..a7aafdb10b 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.20.14")] +[assembly: AssemblyVersion("3.2.20.15")]