Mercurial > mplayer.hg
changeset 16442:11331109ecad
- remove useless /dev/video* checks
- add a proper configure check for v4l2
- prepare for videodev2.h removal
| author | henry |
|---|---|
| date | Sat, 10 Sep 2005 18:38:23 +0000 |
| parents | 2e0c2f65b81c |
| children | 564931dd69aa |
| files | configure libmpdemux/tvi_v4l2.c |
| diffstat | 2 files changed, 13 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Sep 10 18:23:40 2005 +0000 +++ b/configure Sat Sep 10 18:38:23 2005 +0000 @@ -6370,17 +6370,13 @@ if test "$_tv_v4l" = auto ; then _tv_v4l=no if test "$_tv" = yes && linux ; then - for I in /dev/video /dev/video? ; do - if test -c $I ; then - cat > $TMPC <<EOF + cat > $TMPC <<EOF #include <stdlib.h> #include <linux/videodev.h> int main(void) { return 0; } EOF - cc_check && _tv_v4l=yes - break - fi - done + cc_check && _tv_v4l=yes + break fi fi if test "$_tv_v4l" = yes ; then @@ -6397,12 +6393,14 @@ if test "$_tv_v4l2" = auto ; then _tv_v4l2=no if test "$_tv" = yes && linux ; then - for I in /dev/video /dev/video? ; do - if test -c $I ; then - _tv_v4l2=yes - break - fi - done + cat > $TMPC <<EOF +#include <stdlib.h> +#include <linux/types.h> +#include <linux/videodev2.h> +int main(void) { return 0; } +EOF + cc_check && _tv_v4l2=yes + break fi fi if test "$_tv_v4l2" = yes ; then
--- a/libmpdemux/tvi_v4l2.c Sat Sep 10 18:23:40 2005 +0000 +++ b/libmpdemux/tvi_v4l2.c Sat Sep 10 18:38:23 2005 +0000 @@ -40,7 +40,8 @@ #ifdef HAVE_SYS_SYSINFO_H #include <sys/sysinfo.h> #endif -#include "videodev2.h" +#include <linux/types.h> +#include <linux/videodev2.h> #include "../mp_msg.h" #include "../libvo/img_format.h" #include "../libaf/af_format.h"