From 61d581fe4401a70e8d0884d79e0a9553685b6e67 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Wed, 15 Jun 2016 13:36:09 +0100
Subject: [PATCH] Prepare for 2.x push

---
 .../google/android/exoplayer/MediaCodecVideoTrackRenderer.java | 3 ++-
 .../smoothstreaming/SmoothStreamingManifestParser.java         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java b/library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java
index cc3f114b7d..d5e82482ff 100644
--- a/library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java
+++ b/library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java
@@ -87,7 +87,8 @@ public class MediaCodecVideoTrackRenderer extends MediaCodecTrackRenderer {
 
   }
 
-  // TODO: Use MediaFormat constants if these get exposed through the API. See [Internal: b/14127601].
+  // TODO: Use MediaFormat constants if these get exposed through the API. See
+  // [Internal: b/14127601].
   private static final String KEY_CROP_LEFT = "crop-left";
   private static final String KEY_CROP_RIGHT = "crop-right";
   private static final String KEY_CROP_BOTTOM = "crop-bottom";
diff --git a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
index 6efa6e95d9..699b36eef4 100644
--- a/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
+++ b/library/src/main/java/com/google/android/exoplayer/smoothstreaming/SmoothStreamingManifestParser.java
@@ -85,7 +85,7 @@ public class SmoothStreamingManifestParser implements UriLoadable.Parser<SmoothS
   /**
    * A base class for parsers that parse components of a smooth streaming manifest.
    */
-  private static abstract class ElementParser {
+  private abstract static class ElementParser {
 
     private final String baseUri;
     private final String tag;