MPlayer-cvslog

Download

mplayer-cvslog@mplayerhq.hu

June 2019

1 participants
1 discussions

r38148 - in trunk: DOCS/man/en/mplayer.1 DOCS/tech/MAINTAINERS Makefile configure libao2/ao_ivtv.c libao2/audio_out.c libvo/video_out.c libvo/vo_ivtv.c libvo/vo_ivtv.h stream/pvr.h stream/stream_pvr.c
by al 28 Jun '19

28 Jun '19

Author: al Date: Sat Jun 29 00:05:15 2019 New Revision: 38148 Log: 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. Deleted: trunk/libao2/ao_ivtv.c trunk/libvo/vo_ivtv.c trunk/libvo/vo_ivtv.h Modified: trunk/DOCS/tech/MAINTAINERS trunk/Makefile trunk/configure trunk/libao2/audio_out.c trunk/libvo/video_out.c trunk/stream/pvr.h trunk/stream/stream_pvr.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/DOCS/tech/MAINTAINERS ============================================================================== --- trunk/DOCS/tech/MAINTAINERS Wed May 29 12:57:32 2019 (r38147) +++ trunk/DOCS/tech/MAINTAINERS Sat Jun 29 00:05:15 2019 (r38148) @@ -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 Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Wed May 29 12:57:32 2019 (r38147) +++ trunk/Makefile Sat Jun 29 00:05:15 2019 (r38148) @@ -509,7 +509,6 @@ SRCS_MPLAYER-$(GUI_WIN32) += gui/win3 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 Modified: trunk/configure ============================================================================== --- trunk/configure Wed May 29 12:57:32 2019 (r38147) +++ trunk/configure Sat Jun 29 00:05:15 2019 (r38148) @@ -485,7 +485,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] @@ -713,7 +712,6 @@ _fbdev=auto _dvb=auto _dxr2=auto _dxr3=auto -_ivtv=auto _v4l2=auto _iconv=auto _langinfo=auto @@ -1090,8 +1088,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 ;; @@ -5883,35 +5879,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 @@ -8546,7 +8513,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 @@ -9187,7 +9153,6 @@ $def_gl_egl_x11 $def_gl_sdl $def_gl_osx $def_matrixview -$def_ivtv $def_jpeg $def_kva $def_md5sum Modified: trunk/libao2/audio_out.c ============================================================================== --- trunk/libao2/audio_out.c Wed May 29 12:57:32 2019 (r38147) +++ trunk/libao2/audio_out.c Sat Jun 29 00:05:15 2019 (r38148) @@ -50,7 +50,6 @@ extern const ao_functions_t audio_out_ds 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_dr #ifdef CONFIG_DXR2 &audio_out_dxr2, #endif -#ifdef CONFIG_IVTV - &audio_out_ivtv, -#endif #ifdef CONFIG_V4L2_DECODER &audio_out_v4l2, #endif Modified: trunk/libvo/video_out.c ============================================================================== --- trunk/libvo/video_out.c Wed May 29 12:57:32 2019 (r38147) +++ trunk/libvo/video_out.c Sat Jun 29 00:05:15 2019 (r38148) @@ -129,7 +129,6 @@ extern const vo_functions_t video_out_di 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_dr #ifdef CONFIG_DXR3 &video_out_dxr3, #endif -#ifdef CONFIG_IVTV - &video_out_ivtv, -#endif #ifdef CONFIG_V4L2_DECODER &video_out_v4l2, #endif Modified: trunk/stream/pvr.h ============================================================================== --- trunk/stream/pvr.h Wed May 29 12:57:32 2019 (r38147) +++ trunk/stream/pvr.h Sat Jun 29 00:05:15 2019 (r38148) @@ -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) Modified: trunk/stream/stream_pvr.c ============================================================================== --- trunk/stream/stream_pvr.c Wed May 29 12:57:32 2019 (r38147) +++ trunk/stream/stream_pvr.c Sat Jun 29 00:05:15 2019 (r38148) @@ -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)

1 0