View | Details | Raw Unified | Return to bug 202404 | Differences between
and this patch

Collapse All | Expand All

(-)configure (-7 / +4 lines)
Lines 3961-3971 if test "$_v4l2" = auto ; then Link Here
3961
  cat > $TMPC << EOF
3961
  cat > $TMPC << EOF
3962
#include <sys/time.h>
3962
#include <sys/time.h>
3963
#include <linux/videodev2.h>
3963
#include <linux/videodev2.h>
3964
#include <linux/version.h>
3965
int main(void) {
3964
int main(void) {
3966
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22)
3967
#error kernel headers too old, need 2.6.22
3968
#endif
3969
  struct v4l2_ext_controls ctrls;
3965
  struct v4l2_ext_controls ctrls;
3970
  ctrls.ctrl_class = V4L2_CTRL_CLASS_MPEG;
3966
  ctrls.ctrl_class = V4L2_CTRL_CLASS_MPEG;
3971
  return 0;
3967
  return 0;
Lines 4940-4946 echores "$_tv_dshow" Link Here
4940
echocheck "Video 4 Linux 2 TV interface"
4936
echocheck "Video 4 Linux 2 TV interface"
4941
if test "$_tv_v4l2" = auto ; then
4937
if test "$_tv_v4l2" = auto ; then
4942
  _tv_v4l2=no
4938
  _tv_v4l2=no
4943
  if test "$_tv" = yes && linux ; then
4939
  if test "$_tv" = yes ; then
4944
    header_check_broken sys/time.h linux/videodev2.h && _tv_v4l2=yes
4940
    header_check_broken sys/time.h linux/videodev2.h && _tv_v4l2=yes
4945
  elif test "$_tv" = yes && test "$sys_videoio_h" = "yes" ; then
4941
  elif test "$_tv" = yes && test "$sys_videoio_h" = "yes" ; then
4946
    _tv_v4l2=yes
4942
    _tv_v4l2=yes
Lines 4983-4989 echores "$_radio_capture" Link Here
4983
echocheck "Video 4 Linux 2 Radio interface"
4979
echocheck "Video 4 Linux 2 Radio interface"
4984
if test "$_radio_v4l2" = auto ; then
4980
if test "$_radio_v4l2" = auto ; then
4985
  _radio_v4l2=no
4981
  _radio_v4l2=no
4986
  if test "$_radio" = yes && linux ; then
4982
  if test "$_radio" = yes ; then
4987
    header_check linux/videodev2.h && _radio_v4l2=yes
4983
    header_check linux/videodev2.h && _radio_v4l2=yes
4988
  fi
4984
  fi
4989
fi
4985
fi
Lines 5000-5005 echocheck "*BSD BrookTree 848 Radio inte Link Here
5000
   _radio_bsdbt848=no
4996
   _radio_bsdbt848=no
5001
    cat > $TMPC <<EOF
4997
    cat > $TMPC <<EOF
5002
#include <sys/types.h>
4998
#include <sys/types.h>
4999
#include <sys/ioctl.h>
5003
$def_ioctl_bt848_h_name
5000
$def_ioctl_bt848_h_name
5004
#ifdef IOCTL_BT848_H_NAME
5001
#ifdef IOCTL_BT848_H_NAME
5005
#include IOCTL_BT848_H_NAME
5002
#include IOCTL_BT848_H_NAME
Lines 5024-5030 fi Link Here
5024
echocheck "Video 4 Linux 2 MPEG PVR interface"
5021
echocheck "Video 4 Linux 2 MPEG PVR interface"
5025
if test "$_pvr" = auto ; then
5022
if test "$_pvr" = auto ; then
5026
 _pvr=no
5023
 _pvr=no
5027
 if test "$_tv_v4l2" = yes && linux ; then
5024
 if test "$_tv_v4l2" = yes ; then
5028
  cat > $TMPC <<EOF
5025
  cat > $TMPC <<EOF
5029
#include <sys/time.h>
5026
#include <sys/time.h>
5030
#include <linux/videodev2.h>
5027
#include <linux/videodev2.h>
(-)libvo/vo_v4l2.c (-2 lines)
Lines 33-41 Link Here
33
#include <unistd.h>
33
#include <unistd.h>
34
#include <stdlib.h>
34
#include <stdlib.h>
35
#include <inttypes.h>
35
#include <inttypes.h>
36
#include <linux/types.h>
37
#include <linux/videodev2.h>
36
#include <linux/videodev2.h>
38
#include <linux/ioctl.h>
39
37
40
#include "mp_msg.h"
38
#include "mp_msg.h"
41
#include "subopt-helper.h"
39
#include "subopt-helper.h"
(-)stream/stream_pvr.c (-1 lines)
Lines 37-43 Link Here
37
#include <fcntl.h>
37
#include <fcntl.h>
38
#include <inttypes.h>
38
#include <inttypes.h>
39
#include <poll.h>
39
#include <poll.h>
40
#include <linux/types.h>
41
#include <linux/videodev2.h>
40
#include <linux/videodev2.h>
42
41
43
#include "mp_msg.h"
42
#include "mp_msg.h"
(-)stream/stream_radio.c (-6 / +1 lines)
Lines 40-56 Link Here
40
#ifdef IOCTL_BT848_H_NAME
40
#ifdef IOCTL_BT848_H_NAME
41
#include IOCTL_BT848_H_NAME
41
#include IOCTL_BT848_H_NAME
42
#endif
42
#endif
43
43
#endif
44
#else /* CONFIG_RADIO_BSDBT848 */
45
46
#include <linux/types.h>
47
44
48
#ifdef CONFIG_RADIO_V4L2
45
#ifdef CONFIG_RADIO_V4L2
49
#include <linux/videodev2.h>
46
#include <linux/videodev2.h>
50
#endif
47
#endif
51
48
52
#endif // !IOCTL_BT848_H_NAME
53
54
49
55
#include "stream.h"
50
#include "stream.h"
56
#include "libmpdemux/demuxer.h"
51
#include "libmpdemux/demuxer.h"

Return to bug 202404