Merge branch 'release/1.10.x'

panda/src/bullet/bulletHeightfieldShape.cxx

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

panda/src/ffmpeg/ffmpegAudioCursor.cxx

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

panda/src/ffmpeg/ffmpegVideoCursor.cxx

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