TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2021-05-31 17:44:53 +02:00
commit e63eab9aa2
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/bullet/bulletHeightfieldShape.cxx
View File

@ -44,7 +44,7 @@ BulletHeightfieldShape(const PNMImage &image, PN_stdfloat max_height, BulletUpAx
_shape = new btHeightfieldTerrainShape(_num_rows, _shape = new btHeightfieldTerrainShape(_num_rows,
_num_cols, _num_cols,
_data, (const void *)_data,
max_height, max_height,
up, up,
true, false); true, false);
@ -102,7 +102,7 @@ BulletHeightfieldShape(Texture *tex, PN_stdfloat max_height, BulletUpAxis up) :
_shape = new btHeightfieldTerrainShape(_num_rows, _shape = new btHeightfieldTerrainShape(_num_rows,
_num_cols, _num_cols,
_data, (const void *)_data,
max_height, max_height,
up, up,
true, false); true, false);
@ -127,7 +127,7 @@ BulletHeightfieldShape(const BulletHeightfieldShape &copy) {
_shape = new btHeightfieldTerrainShape(_num_rows, _shape = new btHeightfieldTerrainShape(_num_rows,
_num_cols, _num_cols,
_data, (const void *)_data,
_max_height, _max_height,
_up, _up,
true, false); true, false);
@ -208,7 +208,7 @@ fillin(DatagramIterator &scan, BamReader *manager) {
_shape = new btHeightfieldTerrainShape(_num_rows, _shape = new btHeightfieldTerrainShape(_num_rows,
_num_cols, _num_cols,
_data, (const void *)_data,
_max_height, _max_height,
_up, _up,
true, false); true, false);

2
panda/src/ffmpeg/ffmpegAudioCursor.cxx
View File

@ -101,7 +101,7 @@ FfmpegAudioCursor(FfmpegAudio *src) :
_audio_rate = codecpar->sample_rate; _audio_rate = codecpar->sample_rate;
_audio_channels = codecpar->channels; _audio_channels = codecpar->channels;
AVCodec *pAudioCodec = avcodec_find_decoder(codecpar->codec_id); const AVCodec *pAudioCodec = avcodec_find_decoder(codecpar->codec_id);
if (pAudioCodec == nullptr) { if (pAudioCodec == nullptr) {
cleanup(); cleanup();
return; return;

2
panda/src/ffmpeg/ffmpegVideoCursor.cxx
View File

@ -543,7 +543,7 @@ open_stream() {
_video_timebase = av_q2d(stream->time_base); _video_timebase = av_q2d(stream->time_base);
_min_fseek = (int)(3.0 / _video_timebase); _min_fseek = (int)(3.0 / _video_timebase);
AVCodec *pVideoCodec = nullptr; const AVCodec *pVideoCodec = nullptr;
if (ffmpeg_prefer_libvpx) { if (ffmpeg_prefer_libvpx) {
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 0, 0) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 0, 0)
if (codecpar->codec_id == AV_CODEC_ID_VP9) { if (codecpar->codec_id == AV_CODEC_ID_VP9) {