diff options
author | pukkandan <pukkandan@gmail.com> | 2021-01-09 17:56:12 +0530 |
---|---|---|
committer | pukkandan <pukkandan@gmail.com> | 2021-01-09 18:08:07 +0530 |
commit | f5b1bca9139fcbac76dca3a6b17e69f53a885988 (patch) | |
tree | 2426a3eef3733d998bdcd0ac3d56a42f155ce7d7 /youtube_dlc/postprocessor/ffmpeg.py | |
parent | d9eebbc7471b97f3aa58939685bd7b8f4ce35b1e (diff) | |
download | hypervideo-pre-f5b1bca9139fcbac76dca3a6b17e69f53a885988.tar.lz hypervideo-pre-f5b1bca9139fcbac76dca3a6b17e69f53a885988.tar.xz hypervideo-pre-f5b1bca9139fcbac76dca3a6b17e69f53a885988.zip |
Kill child processes when yt-dlc is killed (https://github.com/ytdl-org/youtube-dl/pull/26592)
Authored by: Unrud
Diffstat (limited to 'youtube_dlc/postprocessor/ffmpeg.py')
-rw-r--r-- | youtube_dlc/postprocessor/ffmpeg.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/youtube_dlc/postprocessor/ffmpeg.py b/youtube_dlc/postprocessor/ffmpeg.py index 2141d6311..c6ba1e221 100644 --- a/youtube_dlc/postprocessor/ffmpeg.py +++ b/youtube_dlc/postprocessor/ffmpeg.py @@ -21,6 +21,7 @@ from ..utils import ( dfxp2srt, ISO639Utils, replace_extension, + process_communicate_or_kill, ) @@ -182,7 +183,7 @@ class FFmpegPostProcessor(PostProcessor): handle = subprocess.Popen( cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE, stdin=subprocess.PIPE) - stdout_data, stderr_data = handle.communicate() + stdout_data, stderr_data = process_communicate_or_kill(handle) expected_ret = 0 if self.probe_available else 1 if handle.wait() != expected_ret: return None @@ -230,7 +231,7 @@ class FFmpegPostProcessor(PostProcessor): if self._downloader.params.get('verbose', False): self._downloader.to_screen('[debug] ffmpeg command line: %s' % shell_quote(cmd)) p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE) - stdout, stderr = p.communicate() + stdout, stderr = process_communicate_or_kill(p) if p.returncode != 0: stderr = stderr.decode('utf-8', 'replace') msg = stderr.strip().split('\n')[-1] |