Skip to content

Commit 2937f89

Browse files
committed
vcap/v4l2: remove CentOS 7 compat
CentOS 7 is no longer supported by us - RHEL 8 or derivative (AlmaLinux) is now required at least.
1 parent 3bfe198 commit 2937f89

2 files changed

Lines changed: 0 additions & 10 deletions

File tree

configure.ac

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ else
151151
fi
152152

153153
if test $system = Linux; then
154-
AC_CHECK_HEADERS([linux/version.h])
155154
LDFLAGS="$LDFLAGS -Wl,--dynamic-list-data"
156155
COMMON_FLAGS="${COMMON_FLAGS:+$COMMON_FLAGS }-D_GNU_SOURCE"
157156
fi

src/video_capture/v4l2.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,6 @@
4444
#ifdef HAVE_LIBV4LCONVERT
4545
#include <libv4lconvert.h>
4646
#endif
47-
#ifdef HAVE_LINUX_VERSION_H
48-
#include <linux/version.h>
49-
#else
50-
#define KERNEL_VERSION(x,y,z) -1
51-
#endif
5247

5348
#include <assert.h>
5449
#include <errno.h>
@@ -690,11 +685,7 @@ static int vidcap_v4l2_init(const struct vidcap_params *params, void **state)
690685
memcpy(&s->src_fmt, &fmt, sizeof(fmt));
691686
memcpy(&s->dst_fmt, &fmt, sizeof(fmt));
692687
s->dst_fmt.fmt.pix.bytesperline = 0;
693-
#if LINUX_VERSION_CODE > KERNEL_VERSION(3,10,0)
694688
s->dst_fmt.fmt.pix.colorspace = V4L2_COLORSPACE_DEFAULT;
695-
#else // CentOS 7
696-
s->dst_fmt.fmt.pix.colorspace = V4L2_COLORSPACE_REC709;
697-
#endif
698689

699690
if(ioctl(s->fd, VIDIOC_G_PARM, &stream_params) != 0) {
700691
log_perror(LOG_LEVEL_ERROR, MOD_NAME "Unable to get stream params");

0 commit comments

Comments
 (0)