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

ffmpeg: Fix compile error with latest ffmpeg version

Browse Source 
Fixes #1164
This commit is contained in:
rdb 2021-05-17 11:19:55 +02:00
parent 9410418840
commit 1d2407f667
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -534,7 +534,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) {