summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
Diffstat (limited to 'stream')
-rw-r--r--stream/tv.h3
-rw-r--r--stream/tvi_def.h6
-rw-r--r--stream/tvi_dummy.c8
-rw-r--r--stream/tvi_v4l2.c9
4 files changed, 0 insertions, 26 deletions
diff --git a/stream/tv.h b/stream/tv.h
index 59deda41eb..6511f3aa84 100644
--- a/stream/tv.h
+++ b/stream/tv.h
@@ -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)();
diff --git a/stream/tvi_def.h b/stream/tvi_def.h
index 0a5b76e69f..7a77dd3a50 100644
--- a/stream/tvi_def.h
+++ b/stream/tvi_def.h
@@ -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
diff --git a/stream/tvi_dummy.c b/stream/tvi_dummy.c
index e3a922fade..cf37cd6871 100644
--- a/stream/tvi_dummy.c
+++ b/stream/tvi_dummy.c
@@ -90,14 +90,6 @@ static int control(priv_t *priv, int cmd, void *arg)
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);
diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c
index 2a791fa00e..43656fae01 100644
--- a/stream/tvi_v4l2.c
+++ b/stream/tvi_v4l2.c
@@ -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)
{