diff options
| author | Tom Schouten <doelie@users.sourceforge.net> | 2011-11-28 21:10:19 +0000 |
|---|---|---|
| committer | Tom Schouten <doelie@users.sourceforge.net> | 2011-11-28 21:10:19 +0000 |
| commit | 5d85bb9b5b27a938f94ec93780a64fe0057b842d (patch) | |
| tree | c9cb2d3db6f447db73a45d9d05d0f3079ad8205c /modules/image_io | |
| parent | 2c0fbbc820e98e404caf49f40fe7e0431cbaa1cd (diff) | |
pdp: merge with zwizwa darcs
svn path=/trunk/externals/pdp/; revision=15799
Diffstat (limited to 'modules/image_io')
| -rw-r--r-- | modules/image_io/pdp_qt.c | 5 | ||||
| -rw-r--r-- | modules/image_io/pdp_v4l.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/modules/image_io/pdp_qt.c b/modules/image_io/pdp_qt.c index a46bf45..5802303 100644 --- a/modules/image_io/pdp_qt.c +++ b/modules/image_io/pdp_qt.c @@ -26,9 +26,12 @@ #include "pdp.h" #include "pdp_llconv.h" -#include "s_stuff.h" // need to get sys_libdir for libquicktime plugins +#if PD_MAJOR_VERSION==0 && PD_MINOR_VERSION>=43 +#include "s_stuff.h" // need to get sys_libdir for libquicktime plugins +#endif + #define min(x,y) ((x<y)?(x):(y)) diff --git a/modules/image_io/pdp_v4l.c b/modules/image_io/pdp_v4l.c index d8d5e26..12d527c 100644 --- a/modules/image_io/pdp_v4l.c +++ b/modules/image_io/pdp_v4l.c @@ -38,7 +38,7 @@ #ifdef HAVE_LIBV4L1_VIDEODEV_H # include <libv4l1-videodev.h> -#elif defined HAVE_LINUX_VIDEODEV_H +#elif 1 //defined HAVE_LINUX_VIDEODEV_H # include <linux/videodev.h> #else # error cannot compile pdp_v4l without new kernel and without libv4l-dev |