From 352c4170958029340794c05cb8a6c6824e67f4c1 Mon Sep 17 00:00:00 2001 From: David Rose Date: Wed, 15 Aug 2007 23:58:53 +0000 Subject: [PATCH] compile linux --- panda/src/movies/ffmpegVideo.cxx | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/panda/src/movies/ffmpegVideo.cxx b/panda/src/movies/ffmpegVideo.cxx index eda5673b10..46817028aa 100644 --- a/panda/src/movies/ffmpegVideo.cxx +++ b/panda/src/movies/ffmpegVideo.cxx @@ -23,6 +23,16 @@ #include "avcodec.h" #include "avformat.h" +// Earlier versions of ffmpeg didn't define this symbol. +#ifndef PIX_FMT_BGRA +#ifdef WORDS_BIGENDIAN +#define PIX_FMT_BGRA PIX_FMT_BGR32_1 +#else +#define PIX_FMT_BGRA PIX_FMT_RGBA32 +#endif +#endif // PIX_FMT_BGRA + + TypeHandle FfmpegVideo::_type_handle; //////////////////////////////////////////////////////////////////// @@ -35,8 +45,8 @@ FfmpegVideo(const Filename &name) : MovieVideo(name), _filename(name), _format_ctx(0), - _video_index(-1), _video_ctx(0), + _video_index(-1), _frame(0), _frame_out(0), _min_fseek(3.0)