From 1850a918f1679a78be34619ca49dc9e9c27fec2f Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Mon, 21 Sep 2020 22:57:58 +0100
Subject: [PATCH] Merge pull request #7938 from
 bennettpeter:pullreq-ssa-subtitles

PiperOrigin-RevId: 332814223
---
 RELEASENOTES.md                                              | 5 ++---
 .../com/google/android/exoplayer2/text/ssa/SsaDecoder.java   | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 41cf46d3b7..6c382f8724 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -5,9 +5,8 @@
 *   Data sources:
     *   Add support for `android.resource` URI scheme in `RawResourceDataSource`
         ([#7866](https://github.com/google/ExoPlayer/issues/7866)).
-*   Core library:
-    *   Suppress Guava-related ProGuard/R8 warnings
-        ([#7904](https://github.com/google/ExoPlayer/issues/7904)).
+*   Text:
+    *   Add support for `\h` SSA/ASS style override code (non-breaking space).
 
 ### 2.12.0 (2020-09-11) ###
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
index 3bb39aba9c..064e8dac89 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
@@ -264,7 +264,8 @@ public final class SsaDecoder extends SimpleSubtitleDecoder {
     String text =
         SsaStyle.Overrides.stripStyleOverrides(rawText)
             .replaceAll("\\\\N", "\n")
-            .replaceAll("\\\\n", "\n");
+            .replaceAll("\\\\n", "\n")
+            .replaceAll("\\\\h", "\u00A0");
     Cue cue = createCue(text, style, styleOverrides, screenWidth, screenHeight);
 
     int startTimeIndex = addCuePlacerholderByTime(startTimeUs, cueTimesUs, cues);