mirror/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2026-04-28 01:59:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: Don't use internal SWR_CH_MAX macro.

Browse Source
This commit is contained in:
Sam Edwards
2015-02-24 16:06:40 -08:00
parent 8dbe681143
commit 894423ace4
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
panda/src/ffmpeg/ffmpegAudioCursor.cxx
+1 -2
View File
@@ -313,8 +313,7 @@ reload_buffer() {
#ifdef HAVE_SWRESAMPLE
if (_resample_ctx) {
// Resample the data to signed 16-bit sample format.
uint8_t* out[SWR_CH_MAX] = {(uint8_t*) _buffer, NULL};
bufsize = swr_convert(_resample_ctx, out, _buffer_size / 2, (const uint8_t**)_frame->extended_data, _frame->nb_samples);
bufsize = swr_convert(_resample_ctx, (uint8_t **)&_buffer, _buffer_size / 2, (const uint8_t**)_frame->extended_data, _frame->nb_samples);
bufsize *= _audio_channels * 2;
} else
#endif