Compare commits

..

No commits in common. "171c0b6095c5656b9e104c2cb2f9690a0064f63d" and "1b0de9ade42934e1fee91236173f92f158fb8ecb" have entirely different histories.

2 changed files with 2 additions and 5 deletions

View file

@ -57,15 +57,14 @@ def supported_formats():
stdout = stdout.decode('utf-8') stdout = stdout.decode('utf-8')
stderr = stderr.decode('utf-8') stderr = stderr.decode('utf-8')
version = stderr.split('\n')[0].split(' ')[2] version = stderr.split('\n')[0].split(' ')[2]
mp4 = 'libx264' in stdout and bool(re.compile('DEA.L. aac').findall(stdout))
return { return {
'version': version.split('.'), 'version': version.split('.'),
'ogg': 'libtheora' in stdout and 'libvorbis' in stdout, 'ogg': 'libtheora' in stdout and 'libvorbis' in stdout,
'webm': 'libvpx' in stdout and 'libvorbis' in stdout, 'webm': 'libvpx' in stdout and 'libvorbis' in stdout,
'vp8': 'libvpx' in stdout and 'libvorbis' in stdout, 'vp8': 'libvpx' in stdout and 'libvorbis' in stdout,
'vp9': 'libvpx-vp9' in stdout and 'libopus' in stdout, 'vp9': 'libvpx-vp9' in stdout and 'libopus' in stdout,
'mp4': mp4, 'mp4': 'libx264' in stdout and bool(re.compile('DEA.L. aac').findall(stdout)),
'h264': mp4, 'h264': 'libx264' in stdout and bool(re.compile('DEA.L. aac').findall(stdout)),
} }
def stream(video, target, profile, info, audio_track=0, flags={}): def stream(video, target, profile, info, audio_track=0, flags={}):

View file

@ -794,14 +794,12 @@
"id": "user", "id": "user",
"title": "User", "title": "User",
"type": "string", "type": "string",
"columnWidth": 30,
"capability": "canSeeMedia", "capability": "canSeeMedia",
"find": true "find": true
}, },
{ {
"id": "groups", "id": "groups",
"title": "Group", "title": "Group",
"columnWidth": 30,
"type": ["string"] "type": ["string"]
}, },
{ {