From a5bcb6e0e67750cb4845f3abc2500e18f29f4dc1 Mon Sep 17 00:00:00 2001 From: PulkoMandy Date: Sat, 21 Jan 2023 18:38:27 +0100 Subject: [PATCH] ffmpeg: fix incorrect error check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The function returns a positive nonzero value when it works. Change-Id: I99ee3e2f8f60dff960a07fefc1cf42dc3b3969cd Reviewed-on: https://review.haiku-os.org/c/haiku/+/6013 Tested-by: Commit checker robot Reviewed-by: Jérôme Duval --- src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp b/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp index b3d1a4bd48..cde20a338e 100644 --- a/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp +++ b/src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp @@ -547,11 +547,11 @@ AVCodecEncoder::_EncodeAudio(const uint8* buffer, size_t bufferSize, av_frame_unref(fFrame); fFrame->nb_samples = frameCount; - ret = avcodec_fill_audio_frame(fFrame, fCodecContext->channels, + int count = avcodec_fill_audio_frame(fFrame, fCodecContext->channels, fCodecContext->sample_fmt, (const uint8_t *) buffer, bufferSize, 1); - if (ret != 0) { - TRACE(" avcodec_encode_audio() failed filling data: %ld\n", ret); + if (count < 0) { + TRACE(" avcodec_encode_audio() failed filling data: %d\n", count); return B_ERROR; }