summaryrefslogtreecommitdiffstats
path: root/stream/stream_null.c
diff options
context:
space:
mode:
authorben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-31 18:36:29 +0000
committerben <ben@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-07-31 18:36:29 +0000
commit1cad07f6cddba40362c31b1f08ddb4cb35063f1a (patch)
tree7078553089a5dd18d0265942660324273aded4e7 /stream/stream_null.c
parent7690284b94cecc13f0f6a3d853751df5419c0d58 (diff)
downloadmpv-1cad07f6cddba40362c31b1f08ddb4cb35063f1a.tar.bz2
mpv-1cad07f6cddba40362c31b1f08ddb4cb35063f1a.tar.xz
add an explicit tv stream input instead of the previous hack in stream_null
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19279 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/stream_null.c')
-rw-r--r--stream/stream_null.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/stream/stream_null.c b/stream/stream_null.c
index a494c7810d..71873e4d16 100644
--- a/stream/stream_null.c
+++ b/stream/stream_null.c
@@ -7,24 +7,12 @@
#include "stream.h"
#include "demuxer.h"
-#ifdef USE_TV
-extern char* tv_param_channel;
-#endif
-
-
static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
stream->type = STREAMTYPE_DUMMY;
if(strncmp("mf://",stream->url,5) == 0) {
*file_format = DEMUXER_TYPE_MF;
}
-#ifdef USE_TV
- else if (strncmp("tv://",stream->url,5) == 0) {
- *file_format = DEMUXER_TYPE_TV;
- if(stream->url[5] != '\0')
- tv_param_channel = strdup(stream->url + 5);
- }
-#endif
return 1;
}
@@ -36,9 +24,6 @@ stream_info_t stream_info_null = {
"",
open_s,
{
-#ifdef USE_TV
-"tv",
-#endif
"mf", "null", NULL },
NULL,
0 // Urls are an option string