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

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

Browse Source
This commit is contained in:
rdb 2008-10-16 10:17:31 +00:00
parent 51089282c1
commit acb0722ff5
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/grutil/ffmpegTexture.h
View File

@ -20,8 +20,10 @@
#include "videoTexture.h" #include "videoTexture.h"
#include "avcodec.h" extern "C" {
#include "avformat.h" #include "avcodec.h"
#include "avformat.h"
}
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Class : OpenCVTexture // Class : OpenCVTexture

4
panda/src/movies/config_movies.cxx
View File

@ -17,7 +17,9 @@
#include "webcamVideo.h" #include "webcamVideo.h"
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
#include "avcodec.h" extern "C" {
#include "avcodec.h"
}
#endif #endif
ConfigureDef(config_movies); ConfigureDef(config_movies);

6
panda/src/movies/ffmpegAudioCursor.cxx
View File

@ -15,8 +15,10 @@
#ifdef HAVE_FFMPEG #ifdef HAVE_FFMPEG
#include "ffmpegAudioCursor.h" #include "ffmpegAudioCursor.h"
#include "avcodec.h" extern "C" {
#include "avformat.h" #include "avcodec.h"
#include "avformat.h"
}
TypeHandle FfmpegAudioCursor::_type_handle; TypeHandle FfmpegAudioCursor::_type_handle;

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

@ -16,8 +16,10 @@
#include "ffmpegVideoCursor.h" #include "ffmpegVideoCursor.h"
#include "config_movies.h" #include "config_movies.h"
#include "avcodec.h" extern "C" {
#include "avformat.h" #include "avcodec.h"
#include "avformat.h"
}
#include "pStatCollector.h" #include "pStatCollector.h"
#include "pStatTimer.h" #include "pStatTimer.h"