diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 94426695a6..4d5d367c33 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -1,10 +1,11 @@ # Release notes # -### Current dev branch (from r1.5.1) ### +### r1.5.2 ### -* [Nothing yet] +* MPEG-TS/HLS: Fix frame drops playing H265 video. +* SmoothStreaming: Fix parsing of ProtectionHeader. -### r1.5.0 ### +### r1.5.1 ### * Enable smooth frame release by default. * Added OkHttpDataSource extension. diff --git a/demo/src/main/AndroidManifest.xml b/demo/src/main/AndroidManifest.xml index 9f487f3c52..a857455686 100644 --- a/demo/src/main/AndroidManifest.xml +++ b/demo/src/main/AndroidManifest.xml @@ -16,8 +16,8 @@ diff --git a/demo_misc/vp9_opus_sw/src/main/AndroidManifest.xml b/demo_misc/vp9_opus_sw/src/main/AndroidManifest.xml index d2c749d2a7..d65f24de1b 100644 --- a/demo_misc/vp9_opus_sw/src/main/AndroidManifest.xml +++ b/demo_misc/vp9_opus_sw/src/main/AndroidManifest.xml @@ -17,8 +17,8 @@ diff --git a/library/build.gradle b/library/build.gradle index 0af4bb60a2..0c47f26770 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -77,7 +77,7 @@ publish { userOrg = 'google' groupId = 'com.google.android.exoplayer' artifactId = 'exoplayer' - version = 'r1.5.1' + version = 'r1.5.2' 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 index aad604859e..54640a3d38 100644 --- 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.1"; + public static final String VERSION = "1.5.2"; /** * The version of the library, expressed as an integer. @@ -31,7 +31,7 @@ public final class ExoPlayerLibraryInfo { * Three digits are used for each component of {@link #VERSION}. For example "1.2.3" has the * corresponding integer version 001002003. */ - public static final int VERSION_INT = 001005001; + public static final int VERSION_INT = 001005002; /** * Whether the library was compiled with {@link com.google.android.exoplayer.util.Assertions} diff --git a/playbacktests/src/main/AndroidManifest.xml b/playbacktests/src/main/AndroidManifest.xml index ad9ea57494..1b6ec2c62b 100644 --- a/playbacktests/src/main/AndroidManifest.xml +++ b/playbacktests/src/main/AndroidManifest.xml @@ -17,8 +17,8 @@ + android:versionCode="1502" + android:versionName="1.5.2">