diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-11-01 11:59:42 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-11-01 11:59:42 -0400 |
| commit | c543fdea3a2c16b8bdb0b8b9b71e89a9b106b34c (patch) | |
| tree | 0de2f0896cff67c9c253eb4c9fe492839860f171 /MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs | |
| parent | 142d0e5f48fcbd6d93896ba59b4363fd6b112b4c (diff) | |
| parent | 407b64d0f90a0b6d145b264f198dcb7f33fee95f (diff) | |
Merge branch 'master' of https://github.com/tikuf/MediaBrowser
Conflicts:
MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
MediaBrowser.Api/Playback/Progressive/VideoService.cs
Diffstat (limited to 'MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs')
| -rw-r--r-- | MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs index a66f9c56b..a29a3d069 100644 --- a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs +++ b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Common.Configuration; +using MediaBrowser.Common.Configuration; using MediaBrowser.Common.IO; using MediaBrowser.Common.MediaInfo; using MediaBrowser.Controller.IO; @@ -602,6 +602,8 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder return "-sub_charenc windows-1251"; case "vie": return "-sub_charenc windows-1258"; + case "kor": + return "-sub_charenc cp949"; default: return "-sub_charenc windows-1252"; } |