diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-10 15:44:36 -0400 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-10 15:44:36 -0400 |
| commit | c7d2b3a407940110c3601c9a0d096a5dbc249bb8 (patch) | |
| tree | 19a6e2d99b1ab9234e4fd4be6b1a52cfbea8bbe1 /MediaBrowser.Controller | |
| parent | 3acfd73d86a06fc024e4293e37aa4e0fe226409c (diff) | |
updated ffmpeg. cleaned up some unused api properties
Diffstat (limited to 'MediaBrowser.Controller')
4 files changed, 2 insertions, 5 deletions
diff --git a/MediaBrowser.Controller/Library/DtoBuilder.cs b/MediaBrowser.Controller/Library/DtoBuilder.cs index ef5cbada0a..820fd8c007 100644 --- a/MediaBrowser.Controller/Library/DtoBuilder.cs +++ b/MediaBrowser.Controller/Library/DtoBuilder.cs @@ -367,9 +367,6 @@ namespace MediaBrowser.Controller.Library { var folder = (Folder)item; - dto.IsRoot = folder.IsRoot; - dto.IsVirtualFolder = folder.IsVirtualFolder; - if (fields.Contains(ItemFields.IndexOptions)) { dto.IndexOptions = folder.IndexByOptionStrings.ToArray(); diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 9b75290237..89353b2ef0 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -202,7 +202,7 @@ </ProjectReference> </ItemGroup> <ItemGroup> - <EmbeddedResource Include="MediaInfo\ffmpeg20130209.zip" /> + <EmbeddedResource Include="MediaInfo\ffmpeg20130310.zip" /> <None Include="packages.config" /> </ItemGroup> <ItemGroup> diff --git a/MediaBrowser.Controller/MediaInfo/ffmpeg20130209.zip.REMOVED.git-id b/MediaBrowser.Controller/MediaInfo/ffmpeg20130209.zip.REMOVED.git-id deleted file mode 100644 index 307afc51cb..0000000000 --- a/MediaBrowser.Controller/MediaInfo/ffmpeg20130209.zip.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -985770c0d2633a13719be2e5cf19554262415f62
\ No newline at end of file diff --git a/MediaBrowser.Controller/MediaInfo/ffmpeg20130310.zip.REMOVED.git-id b/MediaBrowser.Controller/MediaInfo/ffmpeg20130310.zip.REMOVED.git-id new file mode 100644 index 0000000000..830011a04f --- /dev/null +++ b/MediaBrowser.Controller/MediaInfo/ffmpeg20130310.zip.REMOVED.git-id @@ -0,0 +1 @@ +a005e50576665b191cbd02b42d6260bffb764690
\ No newline at end of file |