ffmpeg build fixes (also fixes build on ubuntu 12)

This commit is contained in:
niels
2012-11-21 20:05:59 +01:00
parent 7eac3bee69
commit 31f6d39ba5
10 changed files with 11 additions and 9 deletions

View File

@@ -20,6 +20,7 @@
#include <config.h> #include <config.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h>
#include <dirent.h> #include <dirent.h>
#include <fcntl.h> #include <fcntl.h>
#include <dlfcn.h> #include <dlfcn.h>
@@ -31,7 +32,7 @@
#include <libplugger/defs.h> #include <libplugger/defs.h>
#include <libplugger/ldefs.h> #include <libplugger/ldefs.h>
#include <libyuv/yuvconv.h> #include <libyuv/yuvconv.h>
#include <libavutil/avutil.h> #include <libavutil/pixfmt.h>
#include <libplugger/portdef.h> #include <libplugger/portdef.h>
#define LINUX 1 #define LINUX 1
#include <libplugger/specs/FreeFrame.h> #include <libplugger/specs/FreeFrame.h>

View File

@@ -31,7 +31,7 @@
#include <libvevo/libvevo.h> #include <libvevo/libvevo.h>
#include <libplugger/defs.h> #include <libplugger/defs.h>
#include <libyuv/yuvconv.h> #include <libyuv/yuvconv.h>
#include <libavutil/avutil.h> #include <libavutil/pixfmt.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>

View File

@@ -42,7 +42,7 @@
#include <libplugger/specs/livido.h> #include <libplugger/specs/livido.h>
#include <libplugger/portdef.h> #include <libplugger/portdef.h>
#include <libyuv/yuvconv.h> #include <libyuv/yuvconv.h>
#include <libavutil/avutil.h> #include <libavutil/pixfmt.h>
#include <stdlib.h> #include <stdlib.h>
//#include <veejay/oscservit.h> //#include <veejay/oscservit.h>
#include <libplugger/utility.h> #include <libplugger/utility.h>

View File

@@ -27,7 +27,7 @@
#include <veejay/vims.h> #include <veejay/vims.h>
#include <libyuv/yuvconv.h> #include <libyuv/yuvconv.h>
#include <libvjmem/vjmem.h> #include <libvjmem/vjmem.h>
#include <libavutil/avutil.h> #include <libavutil/pixfmt.h>
#include <libvjmsg/vj-msg.h> #include <libvjmsg/vj-msg.h>
#include <veejay/vims.h> #include <veejay/vims.h>
#include <libstream/vj-net.h> #include <libstream/vj-net.h>

View File

@@ -22,7 +22,7 @@
#include <stdio.h> #include <stdio.h>
#include <libvjmem/vjmem.h> #include <libvjmem/vjmem.h>
#include "colorhis.h" #include "colorhis.h"
#include <libavutil/avutil.h> #include <libavutil/pixfmt.h>
#include <libyuv/yuvconv.h> #include <libyuv/yuvconv.h>
#include <veejay/vims.h> #include <veejay/vims.h>
#include "common.h" #include "common.h"

View File

@@ -23,7 +23,7 @@
#include <libvjmem/vjmem.h> #include <libvjmem/vjmem.h>
#include <libvje/vje.h> #include <libvje/vje.h>
#include <libyuv/yuvconv.h> #include <libyuv/yuvconv.h>
#include <libavutil/avutil.h> #include <libavutil/pixfmt.h>
#include "rgbchannel.h" #include "rgbchannel.h"
vj_effect *rgbchannel_init(int w, int h) vj_effect *rgbchannel_init(int w, int h)

View File

@@ -27,6 +27,7 @@
#define PARAM_HEIGHT (1<<0x3) #define PARAM_HEIGHT (1<<0x3)
#define PARAM_FADER (1<<0x1) #define PARAM_FADER (1<<0x1)
typedef struct typedef struct
{ {
int type; int type;

View File

@@ -32,7 +32,7 @@
#include <veejay/vj-viewport.h> #include <veejay/vj-viewport.h>
#include <veejay/vj-composite.h> #include <veejay/vj-composite.h>
#include <veejay/vj-misc.h> #include <veejay/vj-misc.h>
#include <libavutil/avutil.h> #include <libavutil/pixfmt.h>
#ifdef HAVE_XML2 #ifdef HAVE_XML2
#include <libxml/xmlmemory.h> #include <libxml/xmlmemory.h>

View File

@@ -39,7 +39,7 @@
#include <libvjmsg/vj-msg.h> #include <libvjmsg/vj-msg.h>
#include <libvje/vje.h> #include <libvje/vje.h>
#include <libyuv/yuvconv.h> #include <libyuv/yuvconv.h>
#include <libavutil/avutil.h> #include <libavutil/pixfmt.h>
#ifdef STRICT_CHECKING #ifdef STRICT_CHECKING
#include <assert.h> #include <assert.h>
#endif #endif

View File

@@ -40,7 +40,7 @@
#include <veejay/vj-viewport-xml.h> #include <veejay/vj-viewport-xml.h>
#include <libvje/effects/opacity.h> #include <libvje/effects/opacity.h>
#include <libyuv/yuvconv.h> #include <libyuv/yuvconv.h>
#include <libavutil/avutil.h> #include <libavutil/pixfmt.h>
#include <libvjmem/vjmem.h> #include <libvjmem/vjmem.h>
#include <math.h> #include <math.h>
#include <assert.h> #include <assert.h>