[MPlayer-cvslog] r23380 - in trunk/stream: tv.h tvi_def.h tvi_dummy.c tvi_v4l2.c

[voroshil]

Author: voroshil
Date: Thu May 24 11:58:57 2007
New Revision: 23380

Log:
remove unnecessary stubs which were not ever used.


Modified:
   trunk/stream/tv.h
   trunk/stream/tvi_def.h
   trunk/stream/tvi_dummy.c
   trunk/stream/tvi_v4l2.c

Modified: trunk/stream/tv.h
==============================================================================
--- trunk/stream/tv.h	(original)
+++ trunk/stream/tv.h	Thu May 24 11:58:57 2007
@@ -66,9 +66,6 @@ typedef struct tvi_functions_s
     int (*control)();
     int (*start)();
     double (*grab_video_frame)();
-#ifdef HAVE_TV_BSDBT848
-    double (*grabimmediate_video_frame)();
-#endif
     int (*get_video_framesize)();
     double (*grab_audio_frame)();
     int (*get_audio_framesize)();

Modified: trunk/stream/tvi_def.h
==============================================================================
--- trunk/stream/tvi_def.h	(original)
+++ trunk/stream/tvi_def.h	Thu May 24 11:58:57 2007
@@ -6,9 +6,6 @@ static int uninit(priv_t *priv);
 static int control(priv_t *priv, int cmd, void *arg);
 static int start(priv_t *priv);
 static double grab_video_frame(priv_t *priv, char *buffer, int len);
-#ifdef HAVE_TV_BSDBT848
-static double grabimmediate_video_frame(priv_t *priv, char *buffer, int len);
-#endif
 static int get_video_framesize(priv_t *priv);
 static double grab_audio_frame(priv_t *priv, char *buffer, int len);
 static int get_audio_framesize(priv_t *priv);
@@ -20,9 +17,6 @@ static tvi_functions_t functions =
     control,
     start,
     grab_video_frame,
-#ifdef HAVE_TV_BSDBT848
-    grabimmediate_video_frame,
-#endif
     get_video_framesize,
     grab_audio_frame,
     get_audio_framesize

Modified: trunk/stream/tvi_dummy.c
==============================================================================
--- trunk/stream/tvi_dummy.c	(original)
+++ trunk/stream/tvi_dummy.c	Thu May 24 11:58:57 2007
@@ -90,14 +90,6 @@ static int control(priv_t *priv, int cmd
     return(TVI_CONTROL_UNKNOWN);
 }
 
-#ifdef HAVE_TV_BSDBT848
-static double grabimmediate_video_frame(priv_t *priv, char *buffer, int len)
-{
-    memset(buffer, 0xCC, len);
-    return(1);
-}
-#endif
-
 static double grab_video_frame(priv_t *priv, char *buffer, int len)
 {
     memset(buffer, 0x42, len);

Modified: trunk/stream/tvi_v4l2.c
==============================================================================
--- trunk/stream/tvi_v4l2.c	(original)
+++ trunk/stream/tvi_v4l2.c	Thu May 24 11:58:57 2007
@@ -1313,15 +1313,6 @@ static int start(priv_t *priv)
     return 1;
 }
 
-
-#ifdef HAVE_TV_BSDBT848
-static double grabimmediate_video_frame(priv_t *priv, char *buffer, int len)
-{
-    memset(buffer, 0xCC, len);
-    return(1);
-}
-#endif /* HAVE_TV_BSDBT848 */
-
 // copies a video frame
 static inline void copy_frame(priv_t *priv, unsigned char *dest, unsigned char *source)
 {