Merge branch 'master' into keyframe_extraction_v1

# Conflicts:
#	Jellyfin.Api/Controllers/DynamicHlsController.cs
#	MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
#	MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

1 files changed, 1 insertions, 17 deletions

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
index e92c4a08a..c4affa567 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -110,23 +110,7 @@ namespace MediaBrowser.Controller.MediaEncoding
 
         public string OutputContainer { get; set; }
 
-        public string OutputVideoSync
-        {
-            get
-            {
-                // For live tv + in progress recordings
-                if (string.Equals(InputContainer, "mpegts", StringComparison.OrdinalIgnoreCase)
-                    || string.Equals(InputContainer, "ts", StringComparison.OrdinalIgnoreCase))
-                {
-                    if (!MediaSource.RunTimeTicks.HasValue)
-                    {
-                        return "cfr";
-                    }
-                }
-
-                return "-1";
-            }
-        }
+        public string OutputVideoSync { get; set; }
 
         public string AlbumCoverPath { get; set; }