loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-04-30 06:46:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix compilation error in ffmpeg JNI layer

Browse Source 
PiperOrigin-RevId: 490263003
(cherry picked from commit a9be38a339161c9a286c496ba48cdde1d1db5fdc)
This commit is contained in:
christosts 2022-11-22 17:31:00 +00:00 committed by microkatz
parent 103b7cde30
commit 6661b757fd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/decoder_ffmpeg/src/main/jni/ffmpeg_jni.cc
View File

@ -92,7 +92,7 @@ int decodePacket(AVCodecContext *context, AVPacket *packet,
/** /**
* Transforms ffmpeg AVERROR into a negative AUDIO_DECODER_ERROR constant value. * 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. * Outputs a log message describing the avcodec error number.
@ -349,8 +349,8 @@ int decodePacket(AVCodecContext *context, AVPacket *packet,
return outSize; return outSize;
} }
int transformError(int result) { int transformError(int errorNumber) {
return result == AVERROR_INVALIDDATA ? AUDIO_DECODER_ERROR_INVALID_DATA return errorNumber == AVERROR_INVALIDDATA ? AUDIO_DECODER_ERROR_INVALID_DATA
: AUDIO_DECODER_ERROR_OTHER; : AUDIO_DECODER_ERROR_OTHER;
} }