diff options
| author | Lajos Molnar <lajos@google.com> | 2015-01-13 21:14:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-13 21:14:36 +0000 |
| commit | 03bb428a6a1414279f936c9da635899f043e156d (patch) | |
| tree | fc9d797e4e7f27951226fb9f2de39c61871f02ec | |
| parent | bb1f43c64d1a04850df4bcfd9ae1c5537524de45 (diff) | |
| parent | 004e13f2a5a0cf8e2abf94af22cfcee4572313ce (diff) | |
| download | android_external_libvpx-03bb428a6a1414279f936c9da635899f043e156d.tar.gz android_external_libvpx-03bb428a6a1414279f936c9da635899f043e156d.tar.bz2 android_external_libvpx-03bb428a6a1414279f936c9da635899f043e156d.zip | |
am 004e13f2: allow subtitle tracks with ContentEncodings
* commit '004e13f2a5a0cf8e2abf94af22cfcee4572313ce':
allow subtitle tracks with ContentEncodings
| -rw-r--r-- | libwebm/mkvparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libwebm/mkvparser.cpp b/libwebm/mkvparser.cpp index 1f9c740..f7a34c1 100644 --- a/libwebm/mkvparser.cpp +++ b/libwebm/mkvparser.cpp @@ -5944,7 +5944,7 @@ long Tracks::ParseTrackEntry(long long track_start, long long track_size, if (v.start >= 0) return E_FILE_FORMAT_INVALID; - if (e.start >= 0) + if (info.type == Track::kMetadata && e.start >= 0) return E_FILE_FORMAT_INVALID; info.settings.start = -1; |