From 24a164827e4cd6fc0076b00dadf1bc96c3d77396 Mon Sep 17 00:00:00 2001
From: kimvde <kimvde@google.com>
Date: Tue, 28 Mar 2023 14:54:03 +0000
Subject: [PATCH] Fix handling of non-empty decoder end-of-stream output buffer

PiperOrigin-RevId: 520027236
---
 .../src/main/java/androidx/media3/transformer/DefaultCodec.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
index c4a82346b8..ad1762eb4a 100644
--- a/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
+++ b/libraries/transformer/src/main/java/androidx/media3/transformer/DefaultCodec.java
@@ -349,6 +349,7 @@ public final class DefaultCodec implements Codec {
         releaseOutputBuffer(/* render= */ false);
         return false;
       }
+      outputBufferInfo.flags &= ~MediaCodec.BUFFER_FLAG_END_OF_STREAM;
     }
     if ((outputBufferInfo.flags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) {
       // Encountered a CSD buffer, skip it.