aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-06-27 16:56:47 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-06-27 16:56:47 -0400
commit71308b5c29da6506bc294a6b4eb1f4a5b86ce0bd (patch)
treea8d3b0b7032a2785115eeb882a9ddf812262b8b1
parent484aa13e23c6336081cc2e334f0818c0935ec259 (diff)
fix -tp format command line
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs4
-rw-r--r--SharedVersion.cs2
2 files changed, 5 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 60583b95b..44bdafc5b 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 54c495e32..a7aafdb10 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")]