Permalink
Browse files

Merge branch 'master' of github.com:unistra/avc-client

Conflicts	MediaCours.py
  • Loading branch information...
metadirective committed Jan 21, 2014
2 parents a86eda8 + 6c6deba commit 4b1879bcaeefdbc08a7170f7ba9ba5a44fdcde09
Showing with 0 additions and 1 deletion.
  1. +0 −1 MediaCours.py
View
@@ -826,7 +826,6 @@ def recordStop():
os.popen("taskkill /F /IM ffmpeg.exe")
if usage=="video" and videoEncoder=="ffmpeg":
pffmpeg.stdin.write("q") # !!!!!!!!!!!!! DO necessary changes for flash too then !!!!!!!!!!!!!!!!!
- #time.sleep(1) # Is this necessary to be sure the recoridng is finished properly?
pffmpeg.kill()
if usage=="video" and videoEncoder=="wmv":
os.popen("taskkill /F /IM cscript.exe")

0 comments on commit 4b1879b

Please sign in to comment.