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

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

View File

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

View File

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

View File

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

View File

@ -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"