From a114b0e01fbd1e1f6ceaef0bf5e35dc32cf6e802 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 202e03fc64dac568955ce00684368cbea9b244f7) --- extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc b/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc index b15ef0fc500..f2d73959067 100644 --- a/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc +++ b/extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc @@ -91,7 +91,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. @@ -348,9 +348,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) {