diff --git a/panda/src/grutil/ffmpegTexture.h b/panda/src/grutil/ffmpegTexture.h index e9cae02e17..c096245a89 100644 --- a/panda/src/grutil/ffmpegTexture.h +++ b/panda/src/grutil/ffmpegTexture.h @@ -20,8 +20,10 @@ #include "videoTexture.h" -#include "avcodec.h" -#include "avformat.h" +extern "C" { + #include "avcodec.h" + #include "avformat.h" +} //////////////////////////////////////////////////////////////////// // Class : OpenCVTexture diff --git a/panda/src/movies/config_movies.cxx b/panda/src/movies/config_movies.cxx index b4458b4eae..c59e03b454 100644 --- a/panda/src/movies/config_movies.cxx +++ b/panda/src/movies/config_movies.cxx @@ -17,7 +17,9 @@ #include "webcamVideo.h" #ifdef HAVE_FFMPEG -#include "avcodec.h" +extern "C" { + #include "avcodec.h" +} #endif ConfigureDef(config_movies); diff --git a/panda/src/movies/ffmpegAudioCursor.cxx b/panda/src/movies/ffmpegAudioCursor.cxx index 1abd05806c..bbd2c2712f 100644 --- a/panda/src/movies/ffmpegAudioCursor.cxx +++ b/panda/src/movies/ffmpegAudioCursor.cxx @@ -15,8 +15,10 @@ #ifdef HAVE_FFMPEG #include "ffmpegAudioCursor.h" -#include "avcodec.h" -#include "avformat.h" +extern "C" { + #include "avcodec.h" + #include "avformat.h" +} TypeHandle FfmpegAudioCursor::_type_handle; diff --git a/panda/src/movies/ffmpegVideoCursor.cxx b/panda/src/movies/ffmpegVideoCursor.cxx index 817935bee8..75431f3085 100644 --- a/panda/src/movies/ffmpegVideoCursor.cxx +++ b/panda/src/movies/ffmpegVideoCursor.cxx @@ -16,8 +16,10 @@ #include "ffmpegVideoCursor.h" #include "config_movies.h" -#include "avcodec.h" -#include "avformat.h" +extern "C" { + #include "avcodec.h" + #include "avformat.h" +} #include "pStatCollector.h" #include "pStatTimer.h"