loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compiler warning about assignment in conditional.

Browse Source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=140332890
This commit is contained in:
andrewlewis 2016-11-28 01:57:13 -08:00 committed by Oliver Woodman
parent f9c7343e76
commit f7132a7a73
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/ffmpeg/src/main/jni/ffmpeg_jni.cc
View File

@ -267,7 +267,7 @@ int decodePacket(AVCodecContext *context, AVPacket *packet,
sampleFormat, 1); sampleFormat, 1);
AVAudioResampleContext *resampleContext; AVAudioResampleContext *resampleContext;
if (context->opaque) { if (context->opaque) {
resampleContext = (AVAudioResampleContext *)context->opaque; resampleContext = (AVAudioResampleContext *) context->opaque;
} else { } else {
resampleContext = avresample_alloc_context(); resampleContext = avresample_alloc_context();
av_opt_set_int(resampleContext, "in_channel_layout", channelLayout, 0); av_opt_set_int(resampleContext, "in_channel_layout", channelLayout, 0);
@ -326,7 +326,7 @@ void releaseContext(AVCodecContext *context) {
return; return;
} }
AVAudioResampleContext *resampleContext; AVAudioResampleContext *resampleContext;
if (resampleContext = (AVAudioResampleContext *)context->opaque) { if ((resampleContext = (AVAudioResampleContext *) context->opaque)) {
avresample_free(&resampleContext); avresample_free(&resampleContext);
context->opaque = NULL; context->opaque = NULL;
} }