Web lists-archives.com

[MPlayer-dev-eng] [PATCH] Remove ivtv ao and vo drivers




IVTV support is for a long time available through Video4Linux.
The hardware can still be used through the v4l2 vo and ao drivers.

There is still IVTV linux code in a VIDIX driver. This change
doesn't remove the IVTV remnants in the VIDIX source.

Signed-off-by: Alexander Strasser <eclipse7@xxxxxxx>
---

The VIDIX driver is named ivtv (vidix/ivtv_vid.c in MPlayer). It
supports MPEG decoder cards via the ivtv kernel driver or the V4L
kernel driver.

Is there by chance anyone reading this, using vidix ivtv driver in
MPlayer? Or outside of MPlayer?

Anyway as IVTV vs V4L is determined at compile time, I guess I could
safely remove it based on the #ifdefs.

 DOCS/man/en/mplayer.1 |  20 ---
 DOCS/tech/MAINTAINERS |   2 -
 Makefile              |   1 -
 configure             |  35 -----
 libao2/ao_ivtv.c      | 162 -----------------------
 libao2/audio_out.c    |   4 -
 libvo/video_out.c     |   4 -
 libvo/vo_ivtv.c       | 300 ------------------------------------------
 libvo/vo_ivtv.h       |  34 -----
 stream/pvr.h          |   2 -
 stream/stream_pvr.c   |   2 -
 11 files changed, 566 deletions(-)
 delete mode 100644 libao2/ao_ivtv.c
 delete mode 100644 libvo/vo_ivtv.c
 delete mode 100644 libvo/vo_ivtv.h

diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index c832df7d8..a8b1bfacf 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -3268,11 +3268,6 @@ Set buffer size to <size> in samples (default: 2048).
 Creative DXR2 specific output driver
 .
 .TP
-.B ivtv (IVTV only)
-IVTV specific MPEG audio output driver.
-Works with \-ac hwmpa only.
-.
-.TP
 .B v4l2 (requires Linux 2.6.22+ kernel)
 Audio output driver for V4L2 cards with hardware MPEG decoder.
 .
@@ -4730,21 +4725,6 @@ Specifies the device number to use if you have more than one em8300 card.
 .PD 1
 .
 .TP
-.B ivtv (IVTV only)
-Conexant CX23415 (iCompression iTVC15) or Conexant CX23416 (iCompression
-iTVC16) MPEG decoder chip (Hauppauge WinTV PVR-150/250/350/500)
-specific video output driver for TV-out.
-Also see the lavc video filter.
-.PD 0
-.RSs
-.IPs <device>
-Explicitly choose the MPEG decoder device name to use (default: /dev/video16).
-.IPs <output>
-Explicitly choose the TV-out output to be used for the video signal.
-.RE
-.PD 1
-.
-.TP
 .B v4l2 (requires Linux 2.6.22+ kernel)
 Video output driver for V4L2 compliant cards with built-in hardware MPEG decoder.
 Also see the lavc video filter.
diff --git a/DOCS/tech/MAINTAINERS b/DOCS/tech/MAINTAINERS
index 442d3b133..8b114814b 100644
--- a/DOCS/tech/MAINTAINERS
+++ b/DOCS/tech/MAINTAINERS
@@ -169,7 +169,6 @@ libvo drivers:
     * vo_gif89a.c - Joey Parrish
     * vo_gl.c - Reimar Döffinger
     * vo_gl2.c - Reimar Döffinger
-    * vo_ivtv.c - Benjamin Zores
     * vo_jpeg.c - Ivo van Poorten
     * vo_md5sum.c - Ivo van Poorten
     * vo_mga.c - None
@@ -206,7 +205,6 @@ libao2 drivers:
     * ao_dsound.c - None
     * ao_dxr2.c - None
     * ao_esd.c - None
-    * ao_ivtv.c - Benjamin Zores
     * ao_jack.c - Reimar Döffinger
     * ao_mpegpes.c - None
     * ao_nas.c - Tobias Diedrich
diff --git a/Makefile b/Makefile
index efa871d01..d2e406723 100644
--- a/Makefile
+++ b/Makefile
@@ -509,7 +509,6 @@ SRCS_MPLAYER-$(GUI_WIN32)    += gui/win32/dialogs.c                     \
                                 gui/win32/widgetrender.c                \
                                 gui/win32/wincfg.c                      \

-SRCS_MPLAYER-$(IVTV)         += libao2/ao_ivtv.c libvo/vo_ivtv.c
 SRCS_MPLAYER-$(JACK)         += libao2/ao_jack.c
 SRCS_MPLAYER-$(JOYSTICK)     += input/joystick.c
 SRCS_MPLAYER-$(JPEG)         += libvo/vo_jpeg.c
diff --git a/configure b/configure
index 15cf1b3a4..8f14bab22 100755
--- a/configure
+++ b/configure
@@ -478,7 +478,6 @@ Video output:
   --enable-directx         enable DirectX video output [autodetect]
   --enable-dxr2            enable DXR2 video output [autodetect]
   --enable-dxr3            enable DXR3/H+ video output [autodetect]
-  --enable-ivtv            enable IVTV TV-Out video output [autodetect]
   --enable-v4l2            enable V4L2 Decoder audio/video output [autodetect]
   --enable-dvb             enable DVB video output [autodetect]
   --enable-mga             enable mga_vid video output [autodetect]
@@ -706,7 +705,6 @@ _fbdev=auto
 _dvb=auto
 _dxr2=auto
 _dxr3=auto
-_ivtv=auto
 _v4l2=auto
 _iconv=auto
 _langinfo=auto
@@ -1083,8 +1081,6 @@ for ac_option do
   --disable-dxr2)       _dxr2=no        ;;
   --enable-dxr3)        _dxr3=yes       ;;
   --disable-dxr3)       _dxr3=no        ;;
-  --enable-ivtv)        _ivtv=yes       ;;
-  --disable-ivtv)       _ivtv=no        ;;
   --enable-v4l2)        _v4l2=yes       ;;
   --disable-v4l2)       _v4l2=no        ;;
   --enable-iconv)       _iconv=yes      ;;
@@ -5835,35 +5831,6 @@ fi
 echores "$_dxr3"


-echocheck "IVTV TV-Out (pre linux-2.6.24)"
-if test "$_ivtv" = auto ; then
-  cat > $TMPC << EOF
-#include <sys/time.h>
-#include <linux/videodev2.h>
-#include <linux/ivtv.h>
-#include <sys/ioctl.h>
-int main(void) {
-struct ivtv_cfg_stop_decode sd;
-struct ivtv_cfg_start_decode sd1;
-ioctl(0, IVTV_IOC_START_DECODE, &sd1);
-ioctl(0, IVTV_IOC_STOP_DECODE, &sd);
-return 0; }
-EOF
-  _ivtv=no
-  cc_check && _ivtv=yes
-fi
-if test "$_ivtv" = yes ; then
-  def_ivtv='#define CONFIG_IVTV 1'
-  vomodules="ivtv $vomodules"
-  aomodules="ivtv $aomodules"
-else
-  def_ivtv='#undef CONFIG_IVTV'
-  novomodules="ivtv $novomodules"
-  noaomodules="ivtv $noaomodules"
-fi
-echores "$_ivtv"
-
-
 echocheck "V4L2 MPEG Decoder"
 if test "$_v4l2" = auto ; then
   cat > $TMPC << EOF
@@ -8498,7 +8465,6 @@ GUI_WIN32 = $_gui_win32
 HAVE_POSIX_SELECT = $_posix_select
 HAVE_SYS_MMAN_H = $_mman
 HAVE_WINDOWS_H = $windows_h
-IVTV = $_ivtv
 JACK = $_jack
 JOYSTICK = $_joystick
 JPEG = $_jpeg
@@ -9139,7 +9105,6 @@ $def_gl_egl_x11
 $def_gl_sdl
 $def_gl_osx
 $def_matrixview
-$def_ivtv
 $def_jpeg
 $def_kva
 $def_md5sum
diff --git a/libao2/ao_ivtv.c b/libao2/ao_ivtv.c
deleted file mode 100644
index b432cd05d..000000000
--- a/libao2/ao_ivtv.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * audio output for WinTV PVR-150/250/350 (a.k.a IVTV) cards
- * through Connexant hardware MPEG decoder
- * See http://ivtvdriver.org/index.php/Main_Page for more details on the
- * cards supported by the ivtv driver.
- *
- * WARNING: You need to force -ac hwmpa for audio output to work.
- *
- * Copyright (C) 2006 Benjamin Zores
- *
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include <inttypes.h>
-
-#include "config.h"
-
-#include "mp_msg.h"
-#include "help_mp.h"
-
-#include "audio_out.h"
-#include "audio_out_internal.h"
-#include "libaf/af_format.h"
-#include "libmpdemux/mpeg_packetizer.h"
-#include "libvo/vo_ivtv.h"
-#include "libvo/video_out.h" /* only for vo_pts */
-
-#define MPEG_AUDIO_ID 0x1C0
-
-static int freq = 0;
-
-static const ao_info_t info =
-{
-  "IVTV MPEG Audio Decoder output",
-  "ivtv",
-  "Benjamin Zores",
-  ""
-};
-
-LIBAO_EXTERN(ivtv)
-
-/* to set/get/query special features/parameters */
-static int
-control (int cmd,void *arg)
-{
-  return CONTROL_UNKNOWN;
-}
-
-/* open & setup audio device */
-static int
-init (int rate, int channels, int format, int flags)
-{
-  if (ivtv_fd < 0)
-    return 0;
-
-  if (format != AF_FORMAT_MPEG2)
-  {
-    mp_msg (MSGT_AO, MSGL_FATAL,
-            "AO: [ivtv] can only handle MPEG audio streams.\n");
-    return 0;
-  }
-
-  ao_data.outburst = 2048;
-  ao_data.samplerate = rate;
-  ao_data.channels = channels;
-  ao_data.format = AF_FORMAT_MPEG2;
-  ao_data.buffersize = 2048;
-  ao_data.bps = rate * 2 * 2;
-  ao_data.pts = 0;
-  freq = rate;
-
-  /* check for supported audio rate */
-  if (rate != 32000 && rate != 41000 && rate != 48000)
-  {
-    mp_msg (MSGT_AO, MSGL_ERR, MSGTR_AO_MPEGPES_UnsupSamplerate, rate);
-    rate = 48000;
-  }
-
-  return 1;
-}
-
-/* close audio device */
-static void
-uninit (int immed)
-{
-  /* nothing to do */
-}
-
-/* stop playing and empty buffers (for seeking/pause) */
-static void
-reset (void)
-{
-  /* nothing to do */
-}
-
-/* stop playing, keep buffers (for pause) */
-static void
-audio_pause (void)
-{
-  reset ();
-}
-
-/* resume playing, after audio_pause() */
-static void
-audio_resume (void)
-{
-  /* nothing to do */
-}
-
-/* how many bytes can be played without blocking */
-static int
-get_space (void)
-{
-  float x;
-  int y;
-
-  x = (float) (vo_pts - ao_data.pts) / 90000.0;
-  if (x <= 0)
-    return 0;
-
-  y  = freq * 4 * x;
-  y /= ao_data.outburst;
-  y *= ao_data.outburst;
-
-  if (y > 32000)
-    y = 32000;
-
-  return y;
-}
-
-/* number of bytes played */
-static int
-play (void *data, int len, int flags)
-{
-  if (ao_data.format != AF_FORMAT_MPEG2)
-    return 0;
-
-  send_mpeg_pes_packet (data, len, MPEG_AUDIO_ID, ao_data.pts, 2, ivtv_write);
-
-  return len;
-}
-
-/* delay in seconds between first and last sample in buffer */
-static float
-get_delay (void)
-{
-  return 0.0;
-}
diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index 197a63bf7..1b4caf122 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -50,7 +50,6 @@ extern const ao_functions_t audio_out_dsound;
 extern const ao_functions_t audio_out_kai;
 extern const ao_functions_t audio_out_dart;
 extern const ao_functions_t audio_out_dxr2;
-extern const ao_functions_t audio_out_ivtv;
 extern const ao_functions_t audio_out_v4l2;
 extern const ao_functions_t audio_out_mpegpes;
 extern const ao_functions_t audio_out_pcm;
@@ -115,9 +114,6 @@ const ao_functions_t* const audio_out_drivers[] =
 #ifdef CONFIG_DXR2
         &audio_out_dxr2,
 #endif
-#ifdef CONFIG_IVTV
-        &audio_out_ivtv,
-#endif
 #ifdef CONFIG_V4L2_DECODER
         &audio_out_v4l2,
 #endif
diff --git a/libvo/video_out.c b/libvo/video_out.c
index bcf5174f0..a0a01400d 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -129,7 +129,6 @@ extern const vo_functions_t video_out_directx;
 extern const vo_functions_t video_out_kva;
 extern const vo_functions_t video_out_dxr2;
 extern const vo_functions_t video_out_dxr3;
-extern const vo_functions_t video_out_ivtv;
 extern const vo_functions_t video_out_v4l2;
 extern const vo_functions_t video_out_jpeg;
 extern const vo_functions_t video_out_gif89a;
@@ -245,9 +244,6 @@ const vo_functions_t* const video_out_drivers[] =
 #ifdef CONFIG_DXR3
         &video_out_dxr3,
 #endif
-#ifdef CONFIG_IVTV
-        &video_out_ivtv,
-#endif
 #ifdef CONFIG_V4L2_DECODER
         &video_out_v4l2,
 #endif
diff --git a/libvo/vo_ivtv.c b/libvo/vo_ivtv.c
deleted file mode 100644
index f58140207..000000000
--- a/libvo/vo_ivtv.c
+++ /dev/null
@@ -1,300 +0,0 @@
-/*
- * video output for WinTV PVR-150/250/350 (a.k.a IVTV) cards
- * TV-Out through hardware MPEG decoder
- * Based on some old code from ivtv driver authors.
- * See http://ivtvdriver.org/index.php/Main_Page for more details on the
- * cards supported by the ivtv driver.
- *
- * Copyright (C) 2006 Benjamin Zores
- *
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <inttypes.h>
-#include <linux/types.h>
-#include <linux/videodev2.h>
-#include <linux/ivtv.h>
-#include <linux/ioctl.h>
-
-#include "mp_msg.h"
-#include "subopt-helper.h"
-#include "video_out.h"
-#define NO_DRAW_SLICE
-#include "video_out_internal.h"
-#include "vo_ivtv.h"
-#include "libmpdemux/mpeg_packetizer.h"
-
-#define DEFAULT_MPEG_DECODER "/dev/video16"
-#define IVTV_VO_HDR "VO: [ivtv]"
-
-/* ivtv private */
-int ivtv_fd = -1;
-static vo_mpegpes_t *pes;
-
-/* suboptions */
-static int output = -1;
-static char *device = NULL;
-
-static const opt_t subopts[] = {
-  {"output",   OPT_ARG_INT,       &output,       int_non_neg},
-  {"device",   OPT_ARG_MSTRZ,     &device,       NULL},
-  {NULL}
-};
-
-static const vo_info_t info =
-{
-  "IVTV MPEG Video Decoder TV-Out",
-  "ivtv",
-  "Benjamin Zores",
-  ""
-};
-const LIBVO_EXTERN (ivtv)
-
-/* ivtv internals */
-
-static uint32_t
-ivtv_reset (int blank_screen)
-{
-  struct ivtv_cfg_stop_decode sd;
-  struct ivtv_cfg_start_decode sd1;
-  int flags = 0;
-
-  if (blank_screen)
-    flags |= IVTV_STOP_FL_HIDE_FRAME;
-  sd.flags = flags;
-
-  if (ioctl (ivtv_fd, IVTV_IOC_STOP_DECODE, &sd) < 0)
-  {
-    mp_msg (MSGT_VO, MSGL_ERR,
-            "IVTV_IOC_STOP_DECODE: %s\n", strerror (errno));
-    return 1;
-  }
-
-  sd1.gop_offset = 0;
-  sd1.muted_audio_frames = 0;
-
-  if (ioctl (ivtv_fd, IVTV_IOC_START_DECODE, &sd1) < 0)
-  {
-    mp_msg (MSGT_VO, MSGL_ERR,
-            "IVTV_IOC_START_DECODE: %s\n", strerror (errno));
-    return 1;
-  }
-
-  return 0;
-}
-
-int
-ivtv_write (const unsigned char *data, int len)
-{
-  if (ivtv_fd < 0)
-    return 0;
-
-  return write (ivtv_fd, data, len);
-}
-
-/* video out functions */
-
-static int
-config (uint32_t width, uint32_t height,
-        uint32_t d_width, uint32_t d_height,
-        uint32_t fullscreen, char *title, uint32_t format)
-{
-  return 0;
-}
-
-static int
-preinit (const char *arg)
-{
-  struct v4l2_output vout;
-  int err;
-
-  if (subopt_parse (arg, subopts) != 0)
-  {
-    mp_msg (MSGT_VO, MSGL_FATAL,
-            "\n-vo ivtv command line help:\n"
-            "Example: mplayer -vo ivtv:device=/dev/video16:output=2\n"
-            "\nOptions:\n"
-            "  device=/dev/videoX\n"
-            "    Name of the MPEG decoder device file.\n"
-            "  output=<0-...>\n"
-            "    V4L2 id of the TV output.\n"
-            "\n" );
-    return -1;
-  }
-
-  if (!device)
-    device = strdup (DEFAULT_MPEG_DECODER);
-
-  ivtv_fd = open (device, O_RDWR);
-  if (ivtv_fd < 0)
-  {
-    free (device);
-    mp_msg (MSGT_VO, MSGL_FATAL, "%s %s\n", IVTV_VO_HDR, strerror (errno));
-    return -1;
-  }
-
-  /* list available outputs */
-  vout.index = 0;
-  err = 1;
-  mp_msg (MSGT_VO, MSGL_INFO, "%s Available video outputs: ", IVTV_VO_HDR);
-  while (ioctl (ivtv_fd, VIDIOC_ENUMOUTPUT, &vout) >= 0)
-  {
-    err = 0;
-    mp_msg (MSGT_VO, MSGL_INFO, "'#%d, %s' ", vout.index, vout.name);
-    vout.index++;
-  }
-  if (err)
-  {
-    mp_msg (MSGT_VO, MSGL_INFO, "none\n");
-    free (device);
-    return -1;
-  }
-  else
-    mp_msg (MSGT_VO, MSGL_INFO, "\n");
-
-  /* set user specified output */
-  if (output != -1)
-  {
-    if (ioctl (ivtv_fd, VIDIOC_S_OUTPUT, &output) < 0)
-    {
-      mp_msg (MSGT_VO, MSGL_ERR,
-              "%s can't set output (%s)\n", IVTV_VO_HDR, strerror (errno));
-      free (device);
-      return -1;
-    }
-  }
-
-  /* display device name */
-  mp_msg (MSGT_VO, MSGL_INFO, "%s using %s\n", IVTV_VO_HDR, device);
-  free (device);
-
-  /* display current video output */
-  if (ioctl (ivtv_fd, VIDIOC_G_OUTPUT, &output) == 0)
-  {
-    vout.index = output;
-    if (ioctl (ivtv_fd, VIDIOC_ENUMOUTPUT, &vout) < 0)
-    {
-      mp_msg (MSGT_VO, MSGL_ERR,
-              "%s can't get output (%s).\n", IVTV_VO_HDR, strerror (errno));
-      return -1;
-    }
-    else
-      mp_msg (MSGT_VO, MSGL_INFO,
-              "%s video output: %s\n", IVTV_VO_HDR, vout.name);
-  }
-  else
-  {
-    mp_msg (MSGT_VO, MSGL_ERR,
-            "%s can't get output (%s).\n", IVTV_VO_HDR, strerror (errno));
-    return -1;
-  }
-
-  /* clear output */
-  ivtv_reset (1);
-
-  return 0;
-}
-
-static void
-draw_osd (void)
-{
-  /* do nothing */
-}
-
-static int
-draw_frame (uint8_t * src[])
-{
-  pes = (vo_mpegpes_t *) src[0];
-  return 0;
-}
-
-static void
-flip_page (void)
-{
-  if (ivtv_fd < 0)
-    return;
-
-  if (!pes)
-    return;
-
-  send_mpeg_pes_packet (pes->data, pes->size, pes->id,
-                         pes->timestamp ? pes->timestamp : vo_pts, 2,
-                         ivtv_write);
-
-  /* ensure flip_page() won't be called twice */
-  pes = NULL;
-}
-
-static void
-uninit (void)
-{
-  if (ivtv_fd < 0)
-    return;
-
-  /* clear output */
-  ivtv_reset (1);
-
-  /* close device */
-  close (ivtv_fd);
-  ivtv_fd = -1;
-}
-
-static void
-check_events (void)
-{
-  /* do nothing */
-}
-
-static int
-query_format (uint32_t format)
-{
-  if (format != IMGFMT_MPEGPES)
-    return 0;
-
-  return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW | VFCAP_TIMER;
-}
-
-static int
-control (uint32_t request, void *data)
-{
-  switch (request)
-  {
-  case VOCTRL_PAUSE:
-  case VOCTRL_RESUME:
-    return ivtv_reset (0);
-
-  case VOCTRL_RESET:
-    return ivtv_reset (1);
-
-  case VOCTRL_QUERY_FORMAT:
-    return query_format (*((uint32_t*) data));
-  }
-
-  return VO_NOTIMPL;
-}
diff --git a/libvo/vo_ivtv.h b/libvo/vo_ivtv.h
deleted file mode 100644
index da957b4a7..000000000
--- a/libvo/vo_ivtv.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * video output for WinTV PVR-150/250/350 (a.k.a IVTV) cards
- * TV-Out through hardware MPEG decoder
- * Based on some old code from ivtv driver authors.
- * See http://ivtvdriver.org/index.php/Main_Page for more details on the
- * cards supported by the ivtv driver.
- *
- * Copyright (C) 2006 Benjamin Zores
- *
- * This file is part of MPlayer.
- *
- * MPlayer is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * MPlayer is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with MPlayer; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPLAYER_VO_IVTV_H
-#define MPLAYER_VO_IVTV_H
-
-extern int ivtv_fd;
-
-int ivtv_write(const unsigned char *data, int len);
-
-#endif /* MPLAYER_VO_IVTV_H */
diff --git a/stream/pvr.h b/stream/pvr.h
index 7659c1437..6dda73ce7 100644
--- a/stream/pvr.h
+++ b/stream/pvr.h
@@ -1,8 +1,6 @@
 /*
  * stream layer for hardware MPEG 1/2/4 encoders a.k.a PVR
  *  (such as WinTV PVR-150/250/350/500 (a.k.a IVTV), pvrusb2 and cx88)
- * See http://ivtvdriver.org/index.php/Main_Page for more details on the
- *  cards supported by the ivtv driver.
  *
  * Copyright (C) 2006 Benjamin Zores
  * Copyright (C) 2007 Sven Gothel (Channel Navigation)
diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c
index c6f6d185a..e03e76a73 100644
--- a/stream/stream_pvr.c
+++ b/stream/stream_pvr.c
@@ -1,8 +1,6 @@
 /*
  * stream layer for hardware MPEG 1/2/4 encoders a.k.a PVR
  *  (such as WinTV PVR-150/250/350/500 (a.k.a IVTV), pvrusb2 and cx88)
- * See http://ivtvdriver.org/index.php/Main_Page for more details on the
- *  cards supported by the ivtv driver.
  *
  * Copyright (C) 2006 Benjamin Zores
  * Copyright (C) 2007 Sven Gothel (channel navigation)
--
_______________________________________________
MPlayer-dev-eng mailing list
MPlayer-dev-eng@xxxxxxxxxxxx
https://lists.mplayerhq.hu/mailman/listinfo/mplayer-dev-eng