diff options
| author | Mavridis Philippe <[email protected]> | 2021-06-27 15:38:58 +0300 |
|---|---|---|
| committer | Mavridis Philippe <[email protected]> | 2021-06-30 11:03:39 +0300 |
| commit | de786a075b31b4988341a625ef85c081530e2a7d (patch) | |
| tree | ec8d645580223e95a70eae0b0c7d4706ea61609c /kopete/libkopete/avdevice/videodevice.h | |
| parent | e7fdaa7a61e79a1c14d72da2b02cdcfee1956579 (diff) | |
| download | tdenetwork-de786a075b31b4988341a625ef85c081530e2a7d.tar.gz tdenetwork-de786a075b31b4988341a625ef85c081530e2a7d.zip | |
Fixes for Kopete videodevice support
Signed-off-by: Mavridis Philippe <[email protected]>
Diffstat (limited to 'kopete/libkopete/avdevice/videodevice.h')
| -rw-r--r-- | kopete/libkopete/avdevice/videodevice.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kopete/libkopete/avdevice/videodevice.h b/kopete/libkopete/avdevice/videodevice.h index 970f6655..a1ace57e 100644 --- a/kopete/libkopete/avdevice/videodevice.h +++ b/kopete/libkopete/avdevice/videodevice.h @@ -92,11 +92,12 @@ typedef enum { VIDEODEV_DRIVER_NONE #if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV) - , - VIDEODEV_DRIVER_V4L -#ifdef V4L2_CAP_VIDEO_CAPTURE +#if defined(__LINUX_VIDEODEV2_H) /* V4L2 */ , VIDEODEV_DRIVER_V4L2 +#elif defined(__LINUX_VIDEODEV_H) /* V4L */ + , + VIDEODEV_DRIVER_V4L #endif #endif } videodev_driver; @@ -288,7 +289,7 @@ public: //protected: #if (defined(__linux__) || defined(__FreeBSD__)) && defined(ENABLE_AV) -#ifdef V4L2_CAP_VIDEO_CAPTURE +#if defined(__LINUX_VIDEODEV2_H) /* V4L2 */ struct v4l2_capability V4L2_capabilities; struct v4l2_cropcap cropcap; struct v4l2_crop crop; @@ -299,8 +300,7 @@ public: struct v4l2_querymenu querymenu; void enumerateMenu (void); -#endif -#ifdef ENABLE_AV +#elif defined(__LINUX_VIDEODEV_H) /* V4L */ struct video_capability V4L_capabilities; struct video_buffer V4L_videobuffer; #endif |