diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index fe8a639d1a..0fcff4bb7d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -11,6 +11,8 @@
   ([#6771](https://github.com/google/ExoPlayer/issues/6771)).
 * Fix proguard rules for R8 to ensure raw resources used with
   `RawResourceDataSource` are kept.
+* Fix proguard rules to keep `VideoDecoderOutputBuffer` for video decoder
+  extensions.
 
 ### 2.11.0 (2019-12-11) ###
 
diff --git a/library/core/proguard-rules.txt b/library/core/proguard-rules.txt
index 494837c3e9..fd4e196945 100644
--- a/library/core/proguard-rules.txt
+++ b/library/core/proguard-rules.txt
@@ -5,6 +5,11 @@
   public static android.net.Uri buildRawResourceUri(int);
 }
 
+# Some members of this class are being accessed from native methods. Keep them unobfuscated.
+-keep class com.google.android.exoplayer2.video.VideoDecoderOutputBuffer {
+  *;
+}
+
 # Constructors accessed via reflection in DefaultRenderersFactory
 -dontnote com.google.android.exoplayer2.ext.vp9.LibvpxVideoRenderer
 -keepclassmembers class com.google.android.exoplayer2.ext.vp9.LibvpxVideoRenderer {
@@ -71,8 +76,3 @@
 -dontwarn org.checkerframework.**
 -dontwarn kotlin.annotations.jvm.**
 -dontwarn javax.annotation.**
-
-# Some members of this class are being accessed from native methods. Keep them unobfuscated.
--keep class com.google.android.exoplayer2.ext.video.VideoDecoderOutputBuffer {
-  *;
-}