diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-28 22:33:10 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-28 22:33:10 -0500 |
| commit | 5d4682d4185c88332c460021c0ffea26361f291b (patch) | |
| tree | c50c075899778fb5e5caf6acbafe3cb95059adb8 /MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs | |
| parent | 2ed5c3d0e7f61534f7a01b8b200aff9115ddb444 (diff) | |
| parent | 50a16452a99ee5865082c73f2a4e063cb02f6e69 (diff) | |
Merge branch 'dev' into beta
Diffstat (limited to 'MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs index b52446ac6..791dc0cf1 100644 --- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs +++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs @@ -864,7 +864,7 @@ namespace MediaBrowser.MediaEncoding.Probing } } - private void ExtractTimestamp(Model.MediaInfo.MediaInfo video) + private void ExtractTimestamp(MediaInfo video) { if (video.VideoType == VideoType.VideoFile) { |