Bump V1 to 1.5.10 + Fix incorrect Javadoc

------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=129966073
pingor · Aug 11, 2016 · 1e9acb0 · 1e9acb0
1 parent 4547451
commit 1e9acb0
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 14 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,5 +1,12 @@
 # Release notes #
 
+### r1.5.10 ###
+
+* HLS: Stability fixes.
+* MP4: Support for stz2 Atoms.
+* Enable 4K format selection on Sony AndroidTV + nVidia SHIELD.
+* TX3G caption fixes.
+
 ### r1.5.9 ###
 
 * MP4: Fixed incorrect sniffing in some cases (#1523).

diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer.demo"
-    android:versionCode="1509"
-    android:versionName="1.5.9"
+    android:versionCode="1510"
+    android:versionName="1.5.10"
     android:theme="@style/RootTheme">
 
   <uses-permission android:name="android.permission.INTERNET"/>

diff --git a/demo_ext/src/main/AndroidManifest.xml b/demo_ext/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer.demo.ext"
-    android:versionCode="1509"
-    android:versionName="1.5.9"
+    android:versionCode="1510"
+    android:versionName="1.5.10"
     android:theme="@style/RootTheme">
 
   <uses-permission android:name="android.permission.INTERNET"/>

diff --git a/library/build.gradle b/library/build.gradle
@@ -83,7 +83,7 @@ publish {
     userOrg = 'google'
     groupId = 'com.google.android.exoplayer'
     artifactId = 'exoplayer'
-    version = 'r1.5.9'
+    version = 'r1.5.10'
     description = 'The ExoPlayer library.'
     website = 'https://github.com/google/ExoPlayer'
 }
diff --git a/library/src/main/java/com/google/android/exoplayer/ExoPlayerLibraryInfo.java b/library/src/main/java/com/google/android/exoplayer/ExoPlayerLibraryInfo.java
@@ -23,7 +23,7 @@ public final class ExoPlayerLibraryInfo {
   /**
    * The version of the library, expressed as a string.
    */
-  public static final String VERSION = "1.5.9";
+  public static final String VERSION = "1.5.10";
 
   /**
    * The version of the library, expressed as an integer.
@@ -32,7 +32,7 @@ public final class ExoPlayerLibraryInfo {
    * corresponding integer version 1002003 (001-002-003), and "123.45.6" has the corresponding
    * integer version 123045006 (123-045-006).
    */
-  public static final int VERSION_INT = 1005009;
+  public static final int VERSION_INT = 1005010;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer.util.Assertions}

diff --git a/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java b/library/src/main/java/com/google/android/exoplayer/audio/AudioTrack.java
@@ -168,7 +168,7 @@ public InvalidAudioTrackTimestampException(String message) {
 
   /**
    * Whether to enable a workaround for an issue where an audio effect does not keep its session
-   * active across releasing/initializing a new audio track, on platform API version < 21.
+   * active across releasing/initializing a new audio track, on platform API version before 21.
    * <p>
    * The flag must be set before creating a player.
    */

diff --git a/library/src/main/java/com/google/android/exoplayer/metadata/MetadataParser.java b/library/src/main/java/com/google/android/exoplayer/metadata/MetadataParser.java
@@ -18,7 +18,7 @@
 import com.google.android.exoplayer.ParserException;
 
 /**
- * Parses objects of type <T> from binary data.
+ * Parses metadata from binary data.
  *
  * @param <T> The type of the metadata.
  */

diff --git a/library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlParser.java b/library/src/main/java/com/google/android/exoplayer/text/ttml/TtmlParser.java
@@ -54,7 +54,6 @@
  *   <li>time-offset-with-frames
  *   <li>time-offset-with-ticks
  * </ul>
- * </p>
  * @see <a href="http://www.w3.org/TR/ttaf1-dfxp/">TTML specification</a>
  */
 public final class TtmlParser implements SubtitleParser {

diff --git a/library/src/main/java/com/google/android/exoplayer/util/Util.java b/library/src/main/java/com/google/android/exoplayer/util/Util.java
@@ -816,8 +816,8 @@ public static int inferContentType(String fileName) {
    * filesystems. FAT32 is the most restrictive of all filesystems still commonly used today.
    *
    * <p>For simplicity, this only handles common characters known to be illegal on FAT32:
-   * <, >, :, ", /, \, |, ?, and *. % is also escaped since it is used as the escape character.
-   * Escaping is performed in a consistent way so that no collisions occur and
+   * &lt;, &gt;, :, ", /, \, |, ?, and *. % is also escaped since it is used as the escape
+   * character. Escaping is performed in a consistent way so that no collisions occur and
    * {@link #unescapeFileName(String)} can be used to retrieve the original file name.
    *
    * @param fileName File name to be escaped.

diff --git a/playbacktests/src/main/AndroidManifest.xml b/playbacktests/src/main/AndroidManifest.xml
@@ -17,8 +17,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer.playbacktests"
-    android:versionCode="1509"
-    android:versionName="1.5.9">
+    android:versionCode="1510"
+    android:versionName="1.5.10">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.WAKE_LOCK"/>