From c80d30ebceea9d38bba2c8c9a3a9fbb72c5e88df Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 17 Feb 2022 20:04:49 +0000
Subject: [PATCH] Avoid Clearing Supplemental Data Flag In MatroskExtractor

PiperOrigin-RevId: 429368911
---
 .../java/androidx/media3/extractor/mkv/MatroskaExtractor.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
index 9d174c655a..184b6867e6 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/mkv/MatroskaExtractor.java
@@ -1421,7 +1421,7 @@ public class MatroskaExtractor implements Extractor {
         if (blockSampleCount > 1) {
           // There were multiple samples in the block. Appending the additional data to the last
           // sample doesn't make sense. Skip instead.
-          flags &= ~C.BUFFER_FLAG_HAS_SUPPLEMENTAL_DATA;
+          supplementalData.reset(/* limit= */ 0);
         } else {
           // Append supplemental data.
           int supplementalDataSize = supplementalData.limit();