projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f898716
)
[download/external] pass rtmp_conn to ffmpeg
author
Remita Amine
<remitamine@gmail.com>
Tue, 2 Apr 2019 21:41:23 +0000
(22:41 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Tue, 2 Apr 2019 21:41:23 +0000
(22:41 +0100)
youtube_dl/downloader/external.py
patch
|
blob
|
history
diff --git
a/youtube_dl/downloader/external.py
b/youtube_dl/downloader/external.py
index 5f73f7f0f43c65d4e46fd4eafb961bfc36e2f903..acdb27712264005346f1e9163af08ce71b73e84d 100644
(file)
--- a/
youtube_dl/downloader/external.py
+++ b/
youtube_dl/downloader/external.py
@@
-289,6
+289,7
@@
class FFmpegFD(ExternalFD):
tc_url = info_dict.get('tc_url')
flash_version = info_dict.get('flash_version')
live = info_dict.get('rtmp_live', False)
tc_url = info_dict.get('tc_url')
flash_version = info_dict.get('flash_version')
live = info_dict.get('rtmp_live', False)
+ conn = info_dict.get('rtmp_conn')
if player_url is not None:
args += ['-rtmp_swfverify', player_url]
if page_url is not None:
if player_url is not None:
args += ['-rtmp_swfverify', player_url]
if page_url is not None:
@@
-303,6
+304,11
@@
class FFmpegFD(ExternalFD):
args += ['-rtmp_flashver', flash_version]
if live:
args += ['-rtmp_live', 'live']
args += ['-rtmp_flashver', flash_version]
if live:
args += ['-rtmp_live', 'live']
+ if isinstance(conn, list):
+ for entry in conn:
+ args += ['-rtmp_conn', entry]
+ elif isinstance(conn, compat_str):
+ args += ['-rtmp_conn', conn]
args += ['-i', url, '-c', 'copy']
args += ['-i', url, '-c', 'copy']