TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 01:07:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

ffmpeg: Fix a typo in version detection

Browse Source 
See f0b3e08e9c75e5cdcd98c0f3142469918d1d2fd5
This commit is contained in:
Sam Edwards 2018-03-30 23:30:54 -06:00
parent 0b1ad67e13
commit 65210a5e49
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

@ -143,7 +143,7 @@ FfmpegAudioCursor(FfmpegAudio *src) :
_can_seek = true; _can_seek = true;
_can_seek_fast = true; _can_seek_fast = true;
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 59, 100) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101)
_frame = av_frame_alloc(); _frame = av_frame_alloc();
#else #else
_frame = avcodec_alloc_frame(); _frame = avcodec_alloc_frame();

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

@ -96,7 +96,7 @@ init_from(FfmpegVideo *source) {
ReMutexHolder av_holder(_av_lock); ReMutexHolder av_holder(_av_lock);
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 59, 100) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(55, 45, 101)
_frame = av_frame_alloc(); _frame = av_frame_alloc();
_frame_out = av_frame_alloc(); _frame_out = av_frame_alloc();
#else #else