File tree Expand file tree Collapse file tree 2 files changed +2
-4
lines changed
Expand file tree Collapse file tree 2 files changed +2
-4
lines changed Original file line number Diff line number Diff line change @@ -238,8 +238,7 @@ SwrContext* createSwrContext(
238238 " Couldn't create SwrContext: " ,
239239 getFFMPEGErrorStringFromErrorCode (status));
240240#else
241- int64_t outLayout =
242- getOutputChannelLayout (outNumChannels, srcAVFrame);
241+ int64_t outLayout = getOutputChannelLayout (outNumChannels, srcAVFrame);
243242 swrContext = swr_alloc_set_opts (
244243 nullptr ,
245244 outLayout,
Original file line number Diff line number Diff line change @@ -1207,8 +1207,7 @@ void SingleStreamDecoder::convertAudioAVFrameToFrameOutputOnCPU(
12071207 streamInfo.audioStreamOptions .numChannels .value_or (srcNumChannels);
12081208
12091209 bool mustConvert =
1210- (srcSampleFormat != outSampleFormat ||
1211- srcSampleRate != outSampleRate ||
1210+ (srcSampleFormat != outSampleFormat || srcSampleRate != outSampleRate ||
12121211 srcNumChannels != outNumChannels);
12131212
12141213 UniqueAVFrame convertedAVFrame;
You can’t perform that action at this time.
0 commit comments