diff options
| author | Lajos Molnar <lajos@google.com> | 2015-01-13 12:41:04 -0800 |
|---|---|---|
| committer | Lajos Molnar <lajos@google.com> | 2015-01-13 12:48:45 -0800 |
| commit | 004e13f2a5a0cf8e2abf94af22cfcee4572313ce (patch) | |
| tree | 87f72f523a4703a9cea45e9baf86d3efbc8f0bf6 | |
| parent | 04839626ed859623901ebd3a5fd483982186b59d (diff) | |
| download | android_external_libvpx-004e13f2a5a0cf8e2abf94af22cfcee4572313ce.tar.gz android_external_libvpx-004e13f2a5a0cf8e2abf94af22cfcee4572313ce.tar.bz2 android_external_libvpx-004e13f2a5a0cf8e2abf94af22cfcee4572313ce.zip | |
allow subtitle tracks with ContentEncodings
Bug: 18999967
Change-Id: I1842b6e7c6bab4ba0f86938bbe6b110be0c5435f
| -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; |