projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
860db2d
)
[downloader/hls] Do not send 'q' to ffmpeg on Windows (Closes #8300)
author
Sergey M․
<dstftw@gmail.com>
Sat, 6 Feb 2016 17:24:22 +0000
(23:24 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 6 Feb 2016 17:24:22 +0000
(23:24 +0600)
youtube_dl/downloader/hls.py
patch
|
blob
|
history
diff --git
a/youtube_dl/downloader/hls.py
b/youtube_dl/downloader/hls.py
index cb34dc4ab4efa7fc0dd36b6fe1f91481e02d33e0..2a775bf0023f7ddc09507d66ab660a8dd97d19b2 100644
(file)
--- a/
youtube_dl/downloader/hls.py
+++ b/
youtube_dl/downloader/hls.py
@@
-3,6
+3,7
@@
from __future__ import unicode_literals
import os
import re
import subprocess
import os
import re
import subprocess
+import sys
from .common import FileDownloader
from .fragment import FragmentFD
from .common import FileDownloader
from .fragment import FragmentFD
@@
-57,8
+58,10
@@
class HlsFD(FileDownloader):
# subprocces.run would send the SIGKILL signal to ffmpeg and the
# mp4 file couldn't be played, but if we ask ffmpeg to quit it
# produces a file that is playable (this is mostly useful for live
# subprocces.run would send the SIGKILL signal to ffmpeg and the
# mp4 file couldn't be played, but if we ask ffmpeg to quit it
# produces a file that is playable (this is mostly useful for live
- # streams)
- proc.communicate(b'q')
+ # streams). Note that Windows is not affected and produces playable
+ # files (see https://github.com/rg3/youtube-dl/issues/8300).
+ if sys.platform != 'win32':
+ proc.communicate(b'q')
raise
if retval == 0:
fsize = os.path.getsize(encodeFilename(tmpfilename))
raise
if retval == 0:
fsize = os.path.getsize(encodeFilename(tmpfilename))