aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
diff options
context:
space:
mode:
authorSven Van den brande <sven.vandenbrande@outlook.com>2013-11-02 22:39:49 +0100
committerSven Van den brande <sven.vandenbrande@outlook.com>2013-11-02 22:39:49 +0100
commit96d4b9c43b69c0a31196487994476024d3d8b13b (patch)
tree2d81fb9b119689c9cace40af9a42fee7226cb1cd /MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
parent8f7021eb424a89ba0ee5c1acc52d03d149583a1a (diff)
parented34b67f512b07ea2e97f8708811cc4150906f12 (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs')
-rw-r--r--MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs4
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";
}