diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-04-22 12:34:36 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-04-22 12:34:36 -0400 |
| commit | 3386e8f8f7382ea95b655f1a5a66d9761ad341d5 (patch) | |
| tree | cd77eee9bbe535baa63e05c1bb1df8d95614c6f7 /MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs | |
| parent | 55a4510fd386b7cfa4c46de0c26ae614f4fecd57 (diff) | |
| parent | 87aa923d36b4714d3cf9e98ec5a3063a773adcfd (diff) | |
Merge branch 'dev' into beta
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs index b8efedf09..3ab55168d 100644 --- a/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/VideoEncoder.cs @@ -75,7 +75,6 @@ namespace MediaBrowser.MediaEncoding.Encoder { if (state.VideoStream != null && IsH264(state.VideoStream) && string.Equals(state.Options.OutputContainer, "ts", StringComparison.OrdinalIgnoreCase) && !string.Equals(state.VideoStream.NalLengthSize, "0", StringComparison.OrdinalIgnoreCase)) { - Logger.Debug("Enabling h264_mp4toannexb due to nal_length_size of {0}", state.VideoStream.NalLengthSize); args += " -bsf:v h264_mp4toannexb"; } |