diff --git a/AUTHORS b/AUTHORS
index b4e0e330fc..4c7e6900a4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -22,6 +22,7 @@ Andrey Efremov <yoklmnprst@ya.ru>
 Andrew Johnson <ajohnson@draster.com>
 Andy Tamilo <andytamilo@gmail.com>
 Anil Kumar <an1kumar@gmail.com>
+Anna Lemehova <Anna.Lemehova@gmail.com>
 Anton Barkov <anton.barkov@macpaw.com>
 Ben Strong <bstrong@gmail.com>
 Berthold Herrmann <bertholdherrmann08@googlemail.com>
diff --git a/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java b/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java
index fbdc072966..efd11db627 100644
--- a/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java
+++ b/sdk/android/src/java/org/webrtc/AndroidVideoDecoder.java
@@ -303,7 +303,6 @@ class AndroidVideoDecoder implements VideoDecoder, VideoSink {
       renderedTextureMetadata = null;
     }
     callback = null;
-    frameInfos.clear();
     return status;
   }
 
@@ -331,6 +330,7 @@ class AndroidVideoDecoder implements VideoDecoder, VideoSink {
     } finally {
       codec = null;
       outputThread = null;
+      frameInfos.clear();
     }
     return VideoCodecStatus.OK;
   }