diff options
| author | Lajos Molnar <lajos@google.com> | 2013-09-24 11:41:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-24 11:41:52 -0700 |
| commit | 9ae69e73af4368c4b48c743131c065541a8c4f66 (patch) | |
| tree | 656f1c3cdc1501df57d9d3dded3c8d6fe4f40ee3 /media | |
| parent | 5fbd62b3999158a8639d772f5f8e337756ad26b2 (diff) | |
| parent | 6ce2967fa4e9c2a8f8dab741c58c622bacb34a4c (diff) | |
| download | frameworks_base-9ae69e73af4368c4b48c743131c065541a8c4f66.zip frameworks_base-9ae69e73af4368c4b48c743131c065541a8c4f66.tar.gz frameworks_base-9ae69e73af4368c4b48c743131c065541a8c4f66.tar.bz2 | |
am 6ce2967f: am 566d6b65: Merge "WebVttRenderer: allow BOM at beginning of a WebVTT file." into klp-dev
* commit '6ce2967fa4e9c2a8f8dab741c58c622bacb34a4c':
WebVttRenderer: allow BOM at beginning of a WebVTT file.
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/WebVttRenderer.java | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/java/android/media/WebVttRenderer.java b/media/java/android/media/WebVttRenderer.java index 1fe0524..f0bbdb1 100644 --- a/media/java/android/media/WebVttRenderer.java +++ b/media/java/android/media/WebVttRenderer.java @@ -690,6 +690,9 @@ class WebVttParser { final private Phase mParseStart = new Phase() { // 5-9 @Override public void parse(String line) { + if (line.startsWith("\ufeff")) { + line = line.substring(1); + } if (!line.equals("WEBVTT") && !line.startsWith("WEBVTT ") && !line.startsWith("WEBVTT\t")) { |