convert CRLF to LF

[rec10/rec10-git.git] / rec10 / trunk / src / tv2mkv.py

diff --git a/rec10/trunk/src/tv2mkv.py b/rec10/trunk/src/tv2mkv.py
index e713f98..1951a8f 100644 (file)
--- a/rec10/trunk/src/tv2mkv.py
+++ b/rec10/trunk/src/tv2mkv.py
@@ -1,21 +1,21 @@
-#!/usr/bin/python\r
-# coding: UTF-8\r
-# Rec10 TS Recording Tools\r
-# Copyright (C) 2009-2011 Yukikaze\r
-import os\r
-import os.path\r
-import tv2mp4\r
-import configreader\r
-import subprocess\r
-import auto_process\r
-def ts2mkv(pin, pout, opt):\r
-    tpout=pout.replace(".mkv",".mp4")\r
-    tv2mp4.ts2mp4(pin, tpout, opt)\r
-    mp42mkv(pout, tpout)\r
-    if os.path.exists(pout) and os.path.getsize(pout)>os.path.getsize(tpout)*0.9:\r
-        os.remove(tpout)\r
-def mp42mkv(pmkv,pmp4):\r
-    exe = configreader.getConfPath("mkvmerge")\r
-    e1=exe +" -o \""+pmkv+u"\" \""+pmp4+"\""\r
-    p=subprocess.Popen(e1,shell=True)\r
-    os.waitpid(p.pid, 0)\r
+#!/usr/bin/python
+# coding: UTF-8
+# Rec10 TS Recording Tools
+# Copyright (C) 2009-2011 Yukikaze
+import os
+import os.path
+import tv2mp4
+import configreader
+import subprocess
+import auto_process
+def ts2mkv(pin, pout, opt):
+    tpout=pout.replace(".mkv",".mp4")
+    tv2mp4.ts2mp4(pin, tpout, opt)
+    mp42mkv(pout, tpout)
+    if os.path.exists(pout) and os.path.getsize(pout)>os.path.getsize(tpout)*0.9:
+        os.remove(tpout)
+def mp42mkv(pmkv,pmp4):
+    exe = configreader.getConfPath("mkvmerge")
+    e1=exe +" -o \""+pmkv+u"\" \""+pmp4+"\""
+    p=subprocess.Popen(e1,shell=True)
+    os.waitpid(p.pid, 0)