From 7f7f9f1defe1578fe57f7c212f5a65cd659ab149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1ximo=20Casta=C3=B1eda?= <antiswen@yahoo.es>
Date: Sun, 13 Dec 2020 13:33:54 +0100
Subject: [PATCH] ffmpeg decoder: return last chunk of audio

Change-Id: I712e5959f066e65471777e6724637aac7a17d07c
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3510
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
---
 src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
index cb63387a5c..6714aa4d9b 100644
--- a/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
+++ b/src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
@@ -729,6 +729,9 @@ AVCodecDecoder::_DecodeNextAudioFrame()
 		}
 
 		status_t decodeAudioChunkStatus = _DecodeNextAudioFrameChunk();
+		if (decodeAudioChunkStatus == B_LAST_BUFFER_ERROR
+				&& fRawDecodedAudio->nb_samples > 0)
+			break;
 		if (decodeAudioChunkStatus != B_OK)
 			return decodeAudioChunkStatus;
 	}