diff options
| author | Mavridis Philippe <[email protected]> | 2021-06-27 15:38:58 +0300 |
|---|---|---|
| committer | Mavridis Philippe <[email protected]> | 2021-06-30 11:04:57 +0300 |
| commit | 88c2dc15e7839673636c0f26b87d7318d7b931f9 (patch) | |
| tree | 830d569cfafc08ab2f3d63cf3050d33d0f6e6122 /kopete/libkopete/avdevice/videodevice.h | |
| parent | 715f32e924b14576c39dc3337806db2d690b8fe2 (diff) | |
| download | tdenetwork-88c2dc15e7839673636c0f26b87d7318d7b931f9.tar.gz tdenetwork-88c2dc15e7839673636c0f26b87d7318d7b931f9.zip | |
Fixes for Kopete videodevice support
Signed-off-by: Mavridis Philippe <[email protected]>
(cherry picked from commit de786a075b31b4988341a625ef85c081530e2a7d)
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 |