commit f56f9a8401f82fdbc081e38d41e35db12a096118
author android-build-team Robot <android-build-team-robot@google.com> Thu Mar 18 22:02:05 2021 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Mar 18 22:02:05 2021 +0000
tree 3ac12aee8e538a82915782bf47478c24899abe2a
parent 52d45d96baa33dcbacff5c8ae0575c28aa8784ff
parent 368eb3f5bec249a197c95a95583ff8153aa6a87f

Snap for 7218778 from 368eb3f5bec249a197c95a95583ff8153aa6a87f to rvc-d2-release

Change-Id: I02705852d7335ab774bb45d0c97d1ece7ff2a085

libFLAC/stream_encoder.c

diff --git a/libFLAC/stream_encoder.c b/libFLAC/stream_encoder.c
index 037b8cb..b0b2650 100644
--- a/libFLAC/stream_encoder.c
+++ b/libFLAC/stream_encoder.c
@@ -2578,7 +2578,9 @@
 			encoder->private_->verify.needs_magic_hack = true;
 		}
 		else {
-			if(!FLAC__stream_decoder_process_single(encoder->private_->verify.decoder)) {
+			if(!FLAC__stream_decoder_process_single(encoder->private_->verify.decoder)
+			    || (!is_last_block
+				    && (FLAC__stream_encoder_get_verify_decoder_state(encoder) == FLAC__STREAM_DECODER_END_OF_STREAM))) {
 				FLAC__bitwriter_release_buffer(encoder->private_->frame);
 				FLAC__bitwriter_clear(encoder->private_->frame);
 				if(encoder->protected_->state != FLAC__STREAM_ENCODER_VERIFY_MISMATCH_IN_AUDIO_DATA)