merge media encoder changes from dev

This commit is contained in:
Luke Pulverenti
2016-01-04 21:49:30 -05:00
parent e71a3c516a
commit 475c54e283
3 changed files with 23 additions and 20 deletions

View File

@@ -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)
{