[FFmpeg-cvslog] configure: restore autodetection of v4l2 and fbdev
Ramiro Polla
git at videolan.org
Mon Sep 2 04:09:53 EEST 2024
ffmpeg | branch: release/4.2 | Ramiro Polla <ramiro.polla at gmail.com> | Wed Jul 3 00:30:08 2024 +0200| [13f5d6eba5796badd5a0d29cb53ffca8620e36ab] | committer: Brad Smith
configure: restore autodetection of v4l2 and fbdev
The detection logic for v4l2 and fbdev was accidentally modified to
depend on v4l2-m2m in 43b3412.
(cherry picked from commit 7405f1ad5351cc24b91a0227aeeaf24ff9d12278)
Signed-off-by: Brad Smith <brad at comstyle.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=13f5d6eba5796badd5a0d29cb53ffca8620e36ab
---
configure | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 1600af1ad8..ff04a3aa88 100755
--- a/configure
+++ b/configure
@@ -6431,11 +6431,12 @@ perl -v > /dev/null 2>&1 && enable perl || disable perl
pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man
rsync --help 2> /dev/null | grep -q 'contimeout' && enable rsync_contimeout || disable rsync_contimeout
+check_headers linux/fb.h
+check_headers linux/videodev2.h
+test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
+
# check V4L2 codecs available in the API
if enabled v4l2_m2m; then
- check_headers linux/fb.h
- check_headers linux/videodev2.h
- test_code cc linux/videodev2.h "struct v4l2_frmsizeenum vfse; vfse.discrete.width = 0;" && enable_sanitized struct_v4l2_frmivalenum_discrete
check_cc v4l2_m2m linux/videodev2.h "int i = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_VIDEO_M2M | V4L2_BUF_FLAG_LAST;"
check_cc vc1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_VC1_ANNEX_G;"
check_cc mpeg1_v4l2_m2m linux/videodev2.h "int i = V4L2_PIX_FMT_MPEG1;"
More information about the ffmpeg-cvslog
mailing list