Merge remote-tracking branch 'upstream/dev' into peertube

pull/145/head
yausername 2019-12-03 00:45:03 +05:30
commit 00c23683b1
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: F946F508AA241678
2 zmienionych plików z 4 dodań i 3 usunięć

Wyświetl plik

@ -38,6 +38,7 @@ public enum MediaFormat {
MP3 (0x300, "MP3", "mp3", "audio/mpeg"), MP3 (0x300, "MP3", "mp3", "audio/mpeg"),
OPUS (0x400, "opus", "opus", "audio/opus"), OPUS (0x400, "opus", "opus", "audio/opus"),
OGG (0x500, "ogg", "ogg", "audio/ogg"), OGG (0x500, "ogg", "ogg", "audio/ogg"),
WEBMA_OPUS (0x200, "WebM Opus", "webm", "audio/webm"),
// subtitles formats // subtitles formats
VTT (0x1000, "WebVTT", "vtt", "text/vtt"), VTT (0x1000, "WebVTT", "vtt", "text/vtt"),
TTML (0x2000, "Timed Text Markup Language", "ttml", "application/ttml+xml"), TTML (0x2000, "Timed Text Markup Language", "ttml", "application/ttml+xml"),

Wyświetl plik

@ -39,9 +39,9 @@ public class ItagItem {
new ItagItem(139, AUDIO, M4A, 48), new ItagItem(139, AUDIO, M4A, 48),
new ItagItem(140, AUDIO, M4A, 128), new ItagItem(140, AUDIO, M4A, 128),
new ItagItem(141, AUDIO, M4A, 256), new ItagItem(141, AUDIO, M4A, 256),
new ItagItem(249, AUDIO, OPUS, 50), new ItagItem(249, AUDIO, WEBMA_OPUS, 50),
new ItagItem(250, AUDIO, OPUS, 70), new ItagItem(250, AUDIO, WEBMA_OPUS, 70),
new ItagItem(251, AUDIO, OPUS, 160), new ItagItem(251, AUDIO, WEBMA_OPUS, 160),
/// VIDEO ONLY //////////////////////////////////////////// /// VIDEO ONLY ////////////////////////////////////////////
// ID Type Format Resolution FPS /// // ID Type Format Resolution FPS ///