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

Conflicts MediaCours.py
unistra · Jan 21, 2014 · 4b1879b · 4b1879b
2 parents a86eda8 + 6c6deba
commit 4b1879b
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/MediaCours.py b/MediaCours.py
@@ -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")