fix mkv2mp4.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/rec10@332 4e526526-5e11-4fc0-8910-f8fd03428081

diff --git a/rec10/trunk/src/tv2mp4.py b/rec10/trunk/src/tv2mp4.py
index 6b7e3cc..41959a5 100644 (file)
--- a/rec10/trunk/src/tv2mp4.py
+++ b/rec10/trunk/src/tv2mp4.py
@@ -88,7 +88,12 @@ def avi2mp4(pin,pout,opt):
     else:
         exes.append(exe+u" -aviraw audio \'"+pin+u"\'")
         exes.append(exe+u" -aviraw video \'"+pin+u"\'")
-        exes.append(exe+u" -new -fps 29.970030 -add \'"+videopath+u"\'#video -add \'"+audiopath+u"\'#audio \'"+pout+u"\'")
+        if os.path.exists(audiopath):
+            if os.path.exists(os.path.join(dir,title+u"_audio.mp3")):
+                audiopath=os.path.join(dir,title+u"_audio.mp3")
+            elif os.path.exists(os.path.join(dir,title+u"_audio.aac")):
+                audiopath=os.path.join(dir,title+u"_audio.aac")
+        exes.append(exe+u" -fps 29.970030 -add \'"+videopath+u"\' -add \'"+audiopath+u"\' -new \'"+pout+u"\'")
         for e in exes:
             recdblist.printutf8(e)
             txt=txt+e+"\n"
@@ -136,7 +141,7 @@ def mkv2mp4(pin,pout):
     tmpmp4=os.path.join(dir,title+u".tmp.mp4")
     exe0=exeb+u" tracks \'"+pin+u"\' 1:\'"+videopath+u"\' 2:\'"+audiopath+u"\'"
     exe1=exeb+u" timecodes_v2 \'"+pin+"\' 1:\'"+timecodepath+"\'"
-    exe2=exe+u" -new -fps 29.970030 -add \'"+videopath+u"\'#video -add \'"+audiopath+u"\'#audio \'"+tmpmp4+u"\'"
+    exe2=exe+u" -fps 29.970030 -add \'"+videopath+u"\' -add \'"+audiopath+u"\' -new \'"+tmpmp4+u"\'"
     exe3=wineexe+u" "+dtsedit+u" -tc \'Z:\\"+timecodepath+u"\' \'Z:\\"+tmpmp4+u"\' -o \'Z:\\"+pout+u"\'"
     logo=pin.replace(".avi",".log")
     os.environ['LANG']="ja_JP.UTF-8"