X-Git-Url: http://git.osdn.net/view?p=rec10%2Frec10-git.git;a=blobdiff_plain;f=rec10%2Ftrunk%2Fsrc%2Ftv2mp4.py;h=e86136aa506f410c13c5176f4d797cf2e6faf8de;hp=1facd363cd35d1b4007677358d92ea7ef1a2c1c6;hb=1fe0970a03674f7377fb6ac9a3c0f7438424b933;hpb=a89f72a58985c67eb12db176aef8765bfdfdb98c

diff --git a/rec10/trunk/src/tv2mp4.py b/rec10/trunk/src/tv2mp4.py
index 1facd36..e86136a 100644
--- a/rec10/trunk/src/tv2mp4.py
+++ b/rec10/trunk/src/tv2mp4.py
@@ -132,29 +132,33 @@ def addAudio(pts,pmp4,opts):#オプションに応じた音声の追加を行う
         paac1=pts.replace(".ts","_1.aac")
         paac2=pts.replace(".ts","_2.aac")
         recdblist.printutf8(paac1)
+        e1a1=exe +u" -add \""+paac1+"\":mpeg4 \""+pmp4+"\""
+        e1a2=exe +u" -add \""+paac2+"\":mpeg4 \""+pmp4+"\""
         if not os.path.exists(paac1):
             paac1=pts.replace(".ts","_1.mp3")
+            e1a1=exe +u" -add \""+paac1+"\" \""+pmp4+"\""
         if not os.path.exists(paac2):
             paac2=pts.replace(".ts","_2.mp3")
-        e1a1=exe +u" -add \""+paac1+"\" \""+pmp4+"\""
-        e1a2=exe +u" -add \""+paac2+"\" \""+pmp4+"\""
+            e1a1=exe +u" -add \""+paac2+"\" \""+pmp4+"\""
         if os.path.exists(paac1):
             addmp4(paac1, pmp4, e1a1)
         if os.path.exists(paac2):
             addmp4(paac2, pmp4, e1a2)
     elif re.search("b",opts):#BonTsDemuxを使って音声をスプリットした場合
         paac=pts.replace(".ts",".aac")
+        e1a=exe +u" -add \""+pinaac+"\":mpeg4 \""+pmp4+"\""
         if not os.path.exists(paac):
             paac=pts.replace(".ts",".mp3")
-        e1a1=exe +u" -add \""+paac+"\" \""+pmp4+"\""
+            e1a1=exe +u" -add \""+paac+"\" \""+pmp4+"\""
         if os.path.exists(paac):
             addmp4(paac, pmp4, e1a1)
     else:
         tv2audio.ts2single_audio(pts,opts)
         pinaac=pts.replace(".ts",".aac")
+        e1a=exe +u" -add \""+pinaac+"\":mpeg4 \""+pmp4+"\""
         if not os.path.exists(pinaac):
             pinaac=pinaac.replace(".aac",".mp3")
-        e1a=exe +u" -add \""+pinaac+"\" \""+pmp4+"\""
+            e1a=exe +u" -add \""+pinaac+"\" \""+pmp4+"\""
         if os.path.exists(pinaac):
             addmp4(pinaac, pmp4, e1a)
 def execmp4box(pin,pout,cmd):