diff --git a/.gitignore b/.gitignore index 177b87f..3c737af 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -.vscode node_modules /dist /dist-docs diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..baff025 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "editor.defaultFormatter": "dbaeumer.vscode-eslint" +} diff --git a/package-lock.json b/package-lock.json index 636b339..63780a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "mediabunny", - "version": "1.11.1", + "version": "1.11.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "mediabunny", - "version": "1.11.1", + "version": "1.11.2", "license": "MPL-2.0", "workspaces": [ "packages/*" @@ -5900,9 +5900,9 @@ } }, "node_modules/mediabunny": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/mediabunny/-/mediabunny-1.11.0.tgz", - "integrity": "sha512-bdLAnfG5Bx6G8DJeHYWLu3/pzvNfA0fpo3yG/58EzUBLwbOLSYYQdzK/3T6D0l1nclAtvfuVJS19YEAWZF8K1Q==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/mediabunny/-/mediabunny-1.11.1.tgz", + "integrity": "sha512-UsoLZi9aHcQWMHsQF0Y4xSREy2eByFvHRjK3kmvfuaYDHPiqsj0tN6HE+daSzr+WHUh98pFlu2XKXwzBp2AHcQ==", "license": "MPL-2.0", "peer": true, "workspaces": [ @@ -9017,7 +9017,7 @@ }, "packages/mp3-encoder": { "name": "@mediabunny/mp3-encoder", - "version": "1.11.1", + "version": "1.11.2", "license": "MPL-2.0", "devDependencies": { "@types/emscripten": "^1.40.1" diff --git a/package.json b/package.json index 0e28f65..2072d8d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "mediabunny", "author": "Vanilagy", - "version": "1.11.1", + "version": "1.11.2", "description": "Pure TypeScript media toolkit for reading, writing, and converting media files, directly in the browser.", "type": "module", "workspaces": [ diff --git a/packages/mp3-encoder/package.json b/packages/mp3-encoder/package.json index 63591fe..6109b80 100644 --- a/packages/mp3-encoder/package.json +++ b/packages/mp3-encoder/package.json @@ -1,7 +1,7 @@ { "name": "@mediabunny/mp3-encoder", "author": "Vanilagy", - "version": "1.11.1", + "version": "1.11.2", "description": "MP3 encoder extension for Mediabunny, based on LAME.", "main": "./dist/bundles/mediabunny-mp3-encoder.mjs", "module": "./dist/bundles/mediabunny-mp3-encoder.mjs", diff --git a/src/conversion.ts b/src/conversion.ts index aa19d47..014a6bd 100644 --- a/src/conversion.ts +++ b/src/conversion.ts @@ -37,7 +37,15 @@ import { VideoSampleSource, AudioSampleSource, } from './media-source'; -import { assert, clamp, isIso639Dash2LanguageCode, MaybePromise, normalizeRotation, promiseWithResolvers, Rotation } from './misc'; +import { + assert, + clamp, + isIso639Dash2LanguageCode, + MaybePromise, + normalizeRotation, + promiseWithResolvers, + Rotation, +} from './misc'; import { Output, TrackType } from './output'; import { AudioSample, VideoSample } from './sample'; diff --git a/src/matroska/matroska-demuxer.ts b/src/matroska/matroska-demuxer.ts index a1f4b37..e044c59 100644 --- a/src/matroska/matroska-demuxer.ts +++ b/src/matroska/matroska-demuxer.ts @@ -1014,7 +1014,10 @@ export class MatroskaDemuxer extends Demuxer { case EBMLId.Language: { if (!this.currentTrack) break; - if (this.currentTrack.languageCode) break; // LanguageBCP47 was present, which takes precedence + if (this.currentTrack.languageCode !== UNDETERMINED_LANGUAGE) { + // LanguageBCP47 was present, which takes precedence + break; + } this.currentTrack.languageCode = reader.readAsciiString(size);