mirror of
https://github.com/l1ving/youtube-dl
synced 2025-03-11 04:17:19 +08:00
Merge branch 'master' into master
This commit is contained in:
commit
5910bc5741
10
.github/pull.yml
vendored
Normal file
10
.github/pull.yml
vendored
Normal file
@ -0,0 +1,10 @@
|
||||
version: "1"
|
||||
rules:
|
||||
- base: master
|
||||
upstream: aviperes:master # change `wei` to the owner of upstream repo
|
||||
mergeMethod: hardreset
|
||||
assignees:
|
||||
- hashark
|
||||
reviewers:
|
||||
- hashark
|
||||
|
@ -428,7 +428,9 @@ class FacebookIE(InfoExtractor):
|
||||
timestamp = int_or_none(self._search_regex(
|
||||
r'<abbr[^>]+data-utime=["\'](\d+)', webpage,
|
||||
'timestamp', default=None))
|
||||
|
||||
# adding a meaningless comment. Don't we love mess in the code ?
|
||||
# changed the comment from my fork
|
||||
thumbnail = self._og_search_thumbnail(webpage)
|
||||
|
||||
view_count = parse_count(self._search_regex(
|
||||
|
Loading…
x
Reference in New Issue
Block a user