Fix for newer ffmpeg versions, they dropped support for C++

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

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);

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;
 

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"