1
0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2025-10-04 16:04:54 -04:00

Revert "[ffmpeg] Set ffmpeg_location in a contextvar"

This reverts commit 6a7d3a0a09.
This commit is contained in:
pukkandan
2022-08-19 09:49:26 +05:30
parent b76e9cedb3
commit bf6bdf22de
2 changed files with 2 additions and 15 deletions

View File

@@ -1,5 +1,4 @@
import collections
import contextvars
import itertools
import json
import os
@@ -83,8 +82,6 @@ class FFmpegPostProcessorError(PostProcessingError):
class FFmpegPostProcessor(PostProcessor):
_ffmpeg_location = contextvars.ContextVar('ffmpeg_location', default=None)
def __init__(self, downloader=None):
PostProcessor.__init__(self, downloader)
self._prefer_ffmpeg = self.get_param('prefer_ffmpeg', True)
@@ -104,7 +101,7 @@ class FFmpegPostProcessor(PostProcessor):
def _determine_executables(self):
programs = [*self._ffmpeg_to_avconv.keys(), *self._ffmpeg_to_avconv.values()]
location = self.get_param('ffmpeg_location', self._ffmpeg_location.get())
location = self.get_param('ffmpeg_location')
if location is None:
return {p: p for p in programs}