--- a/trunk/tubetutor/tubetutor.py +++ b/trunk/tubetutor/tubetutor.py @@ -283,10 +283,11 @@ r = ffmpeg.renderer() r.resolution(resolution) r.filename(os.path.join(path, "tmp", "intro-concat.mkv")) - r.mux(os.path.join(path, "tmp", "intro.mkv"), os.path.join("media", "intro.mp3")) + r.mux(os.path.join(path, "tmp", "intro.mkv"), os.path.join("media", "intro.mp3"), replace=(not ffmpeg.audio)) videos.append(r.lastfilename) r = ffmpeg.renderer() r.resolution(resolution) + else: params = " -scale %s!" % resolution.replace(":", "x") params += " -font %s -weight 500 -pointsize 100" % ffmpeg.font @@ -308,9 +309,9 @@ description += "- %s" % r.add_text(file) if file.endswith(".mkv") or file.endswith(".mp4"): r.add_video(file) - r.concat(os.path.join(path, "tmp", "concat.mkv"), audio=True) - #r.speedup(os.path.join(path, "tmp", "speedup.mkv"), 0.7) - r.mux(os.path.join(path, "tmp", "main.mkv"), os.path.join("media", "back.mp3")) + r.concat(os.path.join(path, "tmp", "concat.mkv"), audio=ffmpeg.audio) + r.speedup(os.path.join(path, "tmp", "speedup.mkv"), 0.7) + r.mux(os.path.join(path, "tmp", "main.mkv"), os.path.join("media", "back.mp3"), replace=(not ffmpeg.audio)) videos.append(r.lastfilename) # outro