diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-01-19 14:54:07 -0500 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-01-19 14:54:07 -0500 |
| commit | 236b5caee2797d4a8af857cea2f3859bc94d3948 (patch) | |
| tree | 210242ec629d84baa9811dacdad3931a4e5c7b35 /MediaBrowser.XbmcMetadata | |
| parent | e951dd20d95c81da29d4f9d8a2cb927e7639518b (diff) | |
| parent | a5d54256ffb79dd1d0a06df0536f772bbeff9d3d (diff) | |
Merge pull request #1409 from MediaBrowser/beta
merge from beta
Diffstat (limited to 'MediaBrowser.XbmcMetadata')
| -rw-r--r-- | MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj | 2 | ||||
| -rw-r--r-- | MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs | 15 | ||||
| -rw-r--r-- | MediaBrowser.XbmcMetadata/packages.config | 2 |
3 files changed, 15 insertions, 4 deletions
diff --git a/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj b/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj index 353fe31caa..16b6ca9956 100644 --- a/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj +++ b/MediaBrowser.XbmcMetadata/MediaBrowser.XbmcMetadata.csproj @@ -33,7 +33,7 @@ <ItemGroup> <Reference Include="CommonIO, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <SpecificVersion>False</SpecificVersion> - <HintPath>..\packages\CommonIO.1.0.0.5\lib\net45\CommonIO.dll</HintPath> + <HintPath>..\packages\CommonIO.1.0.0.7\lib\net45\CommonIO.dll</HintPath> </Reference> <Reference Include="Patterns.Logging"> <HintPath>..\packages\Patterns.Logging.1.0.0.2\lib\portable-net45+sl4+wp71+win8+wpa81\Patterns.Logging.dll</HintPath> diff --git a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs index fa58b67dae..0da53f575c 100644 --- a/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs +++ b/MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs @@ -305,8 +305,19 @@ namespace MediaBrowser.XbmcMetadata.Savers if (!string.IsNullOrEmpty(stream.Codec)) { - writer.WriteElementString("codec", stream.Codec); - writer.WriteElementString("micodec", stream.Codec); + var codec = stream.Codec; + + if ((stream.CodecTag ?? string.Empty).IndexOf("xvid", StringComparison.OrdinalIgnoreCase) != -1) + { + codec = "xvid;"; + } + else if ((stream.CodecTag ?? string.Empty).IndexOf("divx", StringComparison.OrdinalIgnoreCase) != -1) + { + codec = "divx;"; + } + + writer.WriteElementString("codec", codec); + writer.WriteElementString("micodec", codec); } if (stream.BitRate.HasValue) diff --git a/MediaBrowser.XbmcMetadata/packages.config b/MediaBrowser.XbmcMetadata/packages.config index fad6af08eb..28556744da 100644 --- a/MediaBrowser.XbmcMetadata/packages.config +++ b/MediaBrowser.XbmcMetadata/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="CommonIO" version="1.0.0.5" targetFramework="net45" /> + <package id="CommonIO" version="1.0.0.7" targetFramework="net45" /> <package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" /> </packages>
\ No newline at end of file |