Skip to content

Commit 162f792

Browse files
committed
updated ffmpeg patch
1 parent b09a883 commit 162f792

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

patches/ffmpeg.py.patch

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/yt-dlp/yt_dlp/postprocessor/ffmpeg.py b/yt-dlp/yt_dlp/postprocessor/ffmpeg.py
2-
index 27d06cbde..dfc01003b 100644
2+
index 09eb33b8d..9e1c36b78 100644
33
--- a/yt-dlp/yt_dlp/postprocessor/ffmpeg.py
44
+++ b/yt-dlp/yt_dlp/postprocessor/ffmpeg.py
5-
@@ -91,7 +91,7 @@ def get_versions(downloader=None):
5+
@@ -85,7 +85,7 @@ def get_versions(downloader=None):
66
_version_cache, _features_cache = {}, {}
77

88
def _determine_executables(self):
@@ -11,7 +11,7 @@ index 27d06cbde..dfc01003b 100644
1111

1212
def get_ffmpeg_version(path, prog):
1313
if path in self._version_cache:
14-
@@ -110,7 +110,7 @@ def get_ffmpeg_version(path, prog):
14+
@@ -104,7 +104,7 @@ def get_ffmpeg_version(path, prog):
1515
if mobj:
1616
ver = mobj.group(1)
1717
self._versions[prog] = self._version_cache[path] = ver
@@ -20,7 +20,7 @@ index 27d06cbde..dfc01003b 100644
2020
return
2121

2222
mobj = re.search(r'(?m)^\s+libavformat\s+(?:[0-9. ]+)\s+/\s+(?P<runtime>[0-9. ]+)', out)
23-
@@ -142,9 +142,9 @@ def get_ffmpeg_version(path, prog):
23+
@@ -136,9 +136,9 @@ def get_ffmpeg_version(path, prog):
2424
dirname, basename = location, None
2525
else:
2626
basename = os.path.splitext(os.path.basename(location))[0]
@@ -31,17 +31,17 @@ index 27d06cbde..dfc01003b 100644
3131
+ if basename in ('libffmpeg.bin.so', 'libffprobe.bin.so'):
3232
prefer_ffmpeg = True
3333

34-
self._paths = dict(
35-
@@ -153,7 +153,7 @@ def get_ffmpeg_version(path, prog):
36-
self._paths[basename] = location
34+
self._paths = {
35+
@@ -148,7 +148,7 @@ def get_ffmpeg_version(path, prog):
3736

3837
self._versions = {}
39-
- executables = {'basename': ('ffmpeg', 'avconv'), 'probe_basename': ('ffprobe', 'avprobe')}
40-
+ executables = {'basename': ('libffmpeg.bin.so', 'avconv'), 'probe_basename': ('libffprobe.bin.so', 'avprobe')}
38+
# NB: probe must be first for _features to be poulated correctly
39+
- executables = {'probe_basename': ('ffprobe', 'avprobe'), 'basename': ('ffmpeg', 'avconv')}
40+
+ executables = {'probe_basename': ('libffprobe.bin.so', 'avprobe'), 'basename': ('libffmpeg.bin.so', 'avconv')}
4141
if prefer_ffmpeg is False:
4242
executables = {k: v[::-1] for k, v in executables.items()}
4343
for var, prefs in executables.items():
44-
@@ -237,7 +237,7 @@ def get_audio_codec(self, path):
44+
@@ -231,7 +231,7 @@ def get_audio_codec(self, path):
4545
return None
4646

4747
def get_metadata_object(self, path, opts=[]):
@@ -50,7 +50,7 @@ index 27d06cbde..dfc01003b 100644
5050
if self.probe_available:
5151
self.report_warning('Only ffprobe is supported for metadata extraction')
5252
raise PostProcessingError('ffprobe not found. Please install or provide the path using --ffmpeg-location')
53-
@@ -297,7 +297,7 @@ def real_run_ffmpeg(self, input_path_opts, output_path_opts, *, expected_retcode
53+
@@ -291,7 +291,7 @@ def real_run_ffmpeg(self, input_path_opts, output_path_opts, *, expected_retcode
5454

5555
cmd = [encodeFilename(self.executable, True), encodeArgument('-y')]
5656
# avconv does not have repeat option

0 commit comments

Comments
 (0)