From 6661b757fd0088c9e888e22d63ef63ab1c482c3c Mon Sep 17 00:00:00 2001 From: christosts Date: Tue, 22 Nov 2022 17:31:00 +0000 Subject: [PATCH] Fix compilation error in ffmpeg JNI layer PiperOrigin-RevId: 490263003 (cherry picked from commit a9be38a339161c9a286c496ba48cdde1d1db5fdc) --- libraries/decoder_ffmpeg/src/main/jni/ffmpeg_jni.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/decoder_ffmpeg/src/main/jni/ffmpeg_jni.cc b/libraries/decoder_ffmpeg/src/main/jni/ffmpeg_jni.cc index 17b4d747c9..eeab3d3795 100644 --- a/libraries/decoder_ffmpeg/src/main/jni/ffmpeg_jni.cc +++ b/libraries/decoder_ffmpeg/src/main/jni/ffmpeg_jni.cc @@ -92,7 +92,7 @@ int decodePacket(AVCodecContext *context, AVPacket *packet, /** * Transforms ffmpeg AVERROR into a negative AUDIO_DECODER_ERROR constant value. */ -int transformError(const char *functionName, int errorNumber); +int transformError(int errorNumber); /** * Outputs a log message describing the avcodec error number. @@ -349,9 +349,9 @@ int decodePacket(AVCodecContext *context, AVPacket *packet, return outSize; } -int transformError(int result) { - return result == AVERROR_INVALIDDATA ? AUDIO_DECODER_ERROR_INVALID_DATA - : AUDIO_DECODER_ERROR_OTHER; +int transformError(int errorNumber) { + return errorNumber == AVERROR_INVALIDDATA ? AUDIO_DECODER_ERROR_INVALID_DATA + : AUDIO_DECODER_ERROR_OTHER; } void logError(const char *functionName, int errorNumber) {