merged upstream/dev

This commit is contained in:
yausername 2019-12-10 01:37:33 +05:30
commit fd5f4d9840
No known key found for this signature in database
GPG key ID: F946F508AA241678
60 changed files with 1786 additions and 744 deletions

View file

@ -52,10 +52,12 @@ public class SecondaryStreamHelper<T extends Stream> {
}
}
if (m4v) return null;
// retry, but this time in reverse order
for (int i = audioStreams.size() - 1; i >= 0; i--) {
AudioStream audio = audioStreams.get(i);
if (audio.getFormat() == (m4v ? MediaFormat.MP3 : MediaFormat.OPUS)) {
if (audio.getFormat() == MediaFormat.WEBMA_OPUS) {
return audio;
}
}