[Softdevice-cvs] softdevice configure, 1.43, 1.44 VideoFilter.h, 1.4, 1.5
lucke
nobody at sheep.berlios.de
Wed Jul 11 19:57:05 CEST 2007
Update of /cvsroot/softdevice/softdevice
In directory sheep:/tmp/cvs-serv5393
Modified Files:
configure VideoFilter.h
Log Message:
apply patch by Matthias Schwarzott for compile issues with newer ffmpeg versions
Index: configure
===================================================================
RCS file: /cvsroot/softdevice/softdevice/configure,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** configure 11 Jul 2007 17:52:20 -0000 1.43
--- configure 11 Jul 2007 17:56:57 -0000 1.44
***************
*** 174,180 ****
--- 174,182 ----
cat > ${TMPC} << EOF
#define __STDC_CONSTANT_MACROS
+ extern "C" {
#include <stdlib.h>
#include <avcodec.h>
#include <avformat.h>
+ }
int main(void) {
/* if ( avcodec_build() != LIBAVCODEC_BUILD ) {
***************
*** 250,256 ****
--- 252,260 ----
#define __STDC_CONSTANT_MACROS
#include <stdlib.h>
+ extern "C" {
#include <avcodec.h>
#include <avformat.h>
#include <swscale.h>
+ }
int main(void) {
/* if ( avcodec_build() != LIBAVCODEC_BUILD ) {
Index: VideoFilter.h
===================================================================
RCS file: /cvsroot/softdevice/softdevice/VideoFilter.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VideoFilter.h 11 Jul 2007 17:52:20 -0000 1.4
--- VideoFilter.h 11 Jul 2007 17:56:57 -0000 1.5
***************
*** 15,20 ****
--- 15,22 ----
#ifdef PP_LIBAVCODEC
#include <stdint.h> //needed by postproc.h
+ extern "C" {
#include <postprocess.h>
//#include <postproc/postprocess.h>
+ }
#endif //PP_LIBAVCODEC
***************
*** 61,65 ****
--- 63,69 ----
#ifdef USE_SWSCALE
+ extern "C" {
#include <swscale.h>
+ }
#endif
class cImageConvert : public cVideoFilter {
More information about the Softdevice-cvs
mailing list