TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 02:15:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation issue with older ffmpeg versions

Browse Source
This commit is contained in:
rdb 2016-12-21 17:33:22 +01:00
parent eab2a1a733
commit a13fb0e8ca
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,6 +46,10 @@ PStatCollector FfmpegVideoCursor::_export_frame_pcollector("*:FFMPEG Convert Vid
#define AV_PIX_FMT_BGRA PIX_FMT_BGRA #define AV_PIX_FMT_BGRA PIX_FMT_BGRA
#endif #endif
#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(52, 32, 100)
#define AV_PIX_FMT_FLAG_ALPHA PIX_FMT_FLAG_ALPHA
#endif
/** /**
* This constructor is only used when reading from a bam file. * This constructor is only used when reading from a bam file.
*/ */
@ -512,7 +516,7 @@ open_stream() {
AVCodec *pVideoCodec = NULL; AVCodec *pVideoCodec = NULL;
if (ffmpeg_prefer_libvpx) { if (ffmpeg_prefer_libvpx) {
if (_video_ctx->codec_id == AV_CODEC_ID_VP9) { if ((int)_video_ctx->codec_id == 168) { // AV_CODEC_ID_VP9
pVideoCodec = avcodec_find_decoder_by_name("libvpx-vp9"); pVideoCodec = avcodec_find_decoder_by_name("libvpx-vp9");
} else if (_video_ctx->codec_id == AV_CODEC_ID_VP8) { } else if (_video_ctx->codec_id == AV_CODEC_ID_VP8) {
pVideoCodec = avcodec_find_decoder_by_name("libvpx"); pVideoCodec = avcodec_find_decoder_by_name("libvpx");

5
panda/src/ffmpeg/ffmpegVideoCursor.h
View File

@ -104,7 +104,12 @@ private:
int _max_readahead_frames; int _max_readahead_frames;
ThreadPriority _thread_priority; ThreadPriority _thread_priority;
PT(GenericThread) _thread; PT(GenericThread) _thread;
#if LIBAVUTIL_VERSION_INT < AV_VERSION_INT(51, 74, 100)
PixelFormat _pixel_format;
#else
AVPixelFormat _pixel_format; AVPixelFormat _pixel_format;
#endif
// This global Mutex protects calls to avcodec_opencloseetc. // This global Mutex protects calls to avcodec_opencloseetc.
static ReMutex _av_lock; static ReMutex _av_lock;