From bc01a4f48d3afd2f612e4f91694c36f4f980c42d Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Thu, 11 Sep 2014 16:22:40 +0100
Subject: [PATCH] Relax MediaCodecVideoTrackRenderer.canReconfigureCodec().

Allow non-H264 adaptive decoders.
---
 .../android/exoplayer/MediaCodecVideoTrackRenderer.java   | 8 +++-----
 1 file changed, 3 insertions(+), 5 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 0fd1f4fd47..08661ad557 100644
--- a/library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java
+++ b/library/src/main/java/com/google/android/exoplayer/MediaCodecVideoTrackRenderer.java
@@ -330,11 +330,9 @@ public class MediaCodecVideoTrackRenderer extends MediaCodecTrackRenderer {
   @Override
   protected boolean canReconfigureCodec(MediaCodec codec, boolean codecIsAdaptive,
       MediaFormat oldFormat, MediaFormat newFormat) {
-    // TODO: Relax this check to also allow non-H264 adaptive decoders.
-    return newFormat.mimeType.equals(MimeTypes.VIDEO_H264)
-        && oldFormat.mimeType.equals(MimeTypes.VIDEO_H264)
-        && codecIsAdaptive
-            || (oldFormat.width == newFormat.width && oldFormat.height == newFormat.height);
+    return newFormat.mimeType.equals(oldFormat.mimeType)
+        && (codecIsAdaptive
+            || (oldFormat.width == newFormat.width && oldFormat.height == newFormat.height));
   }
 
   @Override