summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-12 22:11:08 +0200
committerwm4 <wm4@nowhere>2013-07-12 22:16:27 +0200
commitf406482d84b8597235e17bedfb7539a5863d869e (patch)
tree7c51a14cf7ee59c47c681d362cc7d36749860d4b /stream
parent6d8f8fc4f08ade853b4171b068cf9d855eb5a936 (diff)
downloadmpv-f406482d84b8597235e17bedfb7539a5863d869e.tar.bz2
mpv-f406482d84b8597235e17bedfb7539a5863d869e.tar.xz
stream: remove useless author/comment fields
These were printed only with -v. Most streams had them set to useless or redundant values, so it's just badly maintained bloat. Since we remove the "author" field too, and since this may have copyright implications, we add the contents of the author fields to the file headers, except if the name is already part of the file header.
Diffstat (limited to 'stream')
-rw-r--r--stream/stream.c5
-rw-r--r--stream/stream.h3
-rw-r--r--stream/stream_avdevice.c4
-rw-r--r--stream/stream_bluray.c3
-rw-r--r--stream/stream_cdda.c5
-rw-r--r--stream/stream_dvb.c5
-rw-r--r--stream/stream_dvd.c10
-rw-r--r--stream/stream_file.c5
-rw-r--r--stream/stream_lavf.c3
-rw-r--r--stream/stream_memory.c3
-rw-r--r--stream/stream_mf.c4
-rw-r--r--stream/stream_null.c5
-rw-r--r--stream/stream_pvr.c3
-rw-r--r--stream/stream_radio.c5
-rw-r--r--stream/stream_smb.c5
-rw-r--r--stream/stream_tv.c4
-rw-r--r--stream/stream_vcd.c5
17 files changed, 19 insertions, 58 deletions
diff --git a/stream/stream.c b/stream/stream.c
index 1e53b75c4e..7716e51a56 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -183,10 +183,7 @@ static stream_t *open_stream_plugin(const stream_info_t *sinfo,
s->uncached_type = s->type;
- mp_msg(MSGT_OPEN, MSGL_V, "STREAM: [%s] %s\n", sinfo->name, filename);
- mp_msg(MSGT_OPEN, MSGL_V, "STREAM: Description: %s\n", sinfo->info);
- mp_msg(MSGT_OPEN, MSGL_V, "STREAM: Author: %s\n", sinfo->author);
- mp_msg(MSGT_OPEN, MSGL_V, "STREAM: Comment: %s\n", sinfo->comment);
+ mp_msg(MSGT_OPEN, MSGL_V, "[stream] [%s] %s\n", sinfo->name, filename);
if (s->mime_type)
mp_msg(MSGT_OPEN, MSGL_V, "Mime-type: '%s'\n", s->mime_type);
diff --git a/stream/stream.h b/stream/stream.h
index cd2b36a3a3..554c4e2ec3 100644
--- a/stream/stream.h
+++ b/stream/stream.h
@@ -107,10 +107,7 @@ struct stream_dvd_info_req {
struct stream;
typedef struct stream_info_st {
- const char *info;
const char *name;
- const char *author;
- const char *comment;
// opts is set from ->opts
int (*open)(struct stream *st, int mode, void *opts);
const char *protocols[MAX_STREAM_PROTOCOLS];
diff --git a/stream/stream_avdevice.c b/stream/stream_avdevice.c
index eca5a6637a..5d94b35d70 100644
--- a/stream/stream_avdevice.c
+++ b/stream/stream_avdevice.c
@@ -38,11 +38,7 @@ static int open_f(stream_t *stream, int mode, void *opts)
}
const stream_info_t stream_info_avdevice = {
- .info = "FFmpeg libavdevice",
.name = "avdevice",
- .author = "",
- .comment =
- "Force a libavformat/libavdevice demuxer with avdevice://demuxer:args",
.open = open_f,
.protocols = { "avdevice", "av", NULL },
};
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c
index bd8e491cd2..30145203df 100644
--- a/stream/stream_bluray.c
+++ b/stream/stream_bluray.c
@@ -417,10 +417,7 @@ err_no_info:
}
const stream_info_t stream_info_bluray = {
- "Blu-ray Disc",
"bd",
- "Benjamin Zores",
- "Play Blu-ray discs through external libbluray",
bluray_stream_open,
{ "bd", "br", "bluray", NULL },
&bluray_stream_opts,
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index 2f72d442bd..670f47e156 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -1,6 +1,8 @@
/*
* This file is part of MPlayer.
*
+ * Original author: Albeu
+ *
* 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
@@ -487,10 +489,7 @@ static int open_cdda(stream_t *st, int m, void *opts)
}
const stream_info_t stream_info_cdda = {
- "CDDA",
"cdda",
- "Albeu",
- "",
open_cdda,
{"cdda", NULL },
&stream_opts,
diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c
index 898d57221b..53761e8f60 100644
--- a/stream/stream_dvb.c
+++ b/stream/stream_dvb.c
@@ -3,6 +3,8 @@
dvbstream
(C) Dave Chapman <dave@dchapman.com> 2001, 2002.
+Original authors: Nico, probably Arpi
+
The latest version can be found at http://www.linuxstb.org/dvbstream
Modified for use with MPlayer, for details see the changelog at
@@ -855,10 +857,7 @@ dvb_config_t *dvb_get_config(void)
const stream_info_t stream_info_dvb = {
- "Dvb Input",
"dvbin",
- "Nico",
- "based on the code from ??? (probably Arpi)",
dvb_open,
{ "dvb", NULL },
&stream_opts,
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index b8161d16fa..565054d81b 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -1,6 +1,8 @@
/*
* This file is part of MPlayer.
*
+ * Original author: Benjamin Zores
+ *
* 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
@@ -1090,10 +1092,7 @@ static int ifo_stream_open (stream_t *stream, int mode, void *opts)
}
const stream_info_t stream_info_dvd = {
- "DVD stream",
- "null",
- "",
- "",
+ "dvd",
open_s,
{ "dvd", NULL },
&stream_opts,
@@ -1101,10 +1100,7 @@ const stream_info_t stream_info_dvd = {
};
const stream_info_t stream_info_ifo = {
- "DVD IFO input",
"ifo",
- "Benjamin Zores",
- "Mostly used to play DVDs on disk through OSD Menu",
ifo_stream_open,
{ "file", "", NULL },
NULL,
diff --git a/stream/stream_file.c b/stream/stream_file.c
index 6166610ec6..b9e4f2f2e1 100644
--- a/stream/stream_file.c
+++ b/stream/stream_file.c
@@ -1,6 +1,8 @@
/*
* This file is part of MPlayer.
*
+ * Original authors: Albeu, probably Arpi
+ *
* 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
@@ -237,10 +239,7 @@ static int open_f(stream_t *stream,int mode, void* opts)
}
const stream_info_t stream_info_file = {
- "File",
"file",
- "Albeu",
- "based on the code from ??? (probably Arpi)",
open_f,
{ "file", "", NULL },
&stream_opts,
diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c
index 6b8f25b56f..82241e83f3 100644
--- a/stream/stream_lavf.c
+++ b/stream/stream_lavf.c
@@ -305,10 +305,7 @@ done:
}
const stream_info_t stream_info_ffmpeg = {
- "FFmpeg",
"ffmpeg",
- "",
- "",
open_f,
{ "lavf", "ffmpeg", "rtmp", "rtsp", "http", "https", "mms", "mmst", "mmsh",
"mmshttp", "udp", "ftp", "rtp", "httpproxy", NULL },
diff --git a/stream/stream_memory.c b/stream/stream_memory.c
index 2e96a13e37..79bfea459d 100644
--- a/stream/stream_memory.c
+++ b/stream/stream_memory.c
@@ -73,10 +73,7 @@ static int open_f(stream_t *stream, int mode, void* opts)
}
const stream_info_t stream_info_memory = {
- "Memory",
"memory",
- "",
- "",
open_f,
{ "memory", NULL },
};
diff --git a/stream/stream_mf.c b/stream/stream_mf.c
index 4e560da2f4..9f87dad6b1 100644
--- a/stream/stream_mf.c
+++ b/stream/stream_mf.c
@@ -2,6 +2,7 @@
* stream layer for multiple files input, based on previous work from Albeu
*
* Copyright (C) 2006 Benjamin Zores
+ * Original author: Albeu
*
* This file is part of MPlayer.
*
@@ -37,10 +38,7 @@ mf_stream_open (stream_t *stream, int mode, void *opts)
}
const stream_info_t stream_info_mf = {
- "Multiple files input",
"mf",
- "Benjamin Zores, Albeu",
- "",
mf_stream_open,
{ "mf", NULL },
NULL,
diff --git a/stream/stream_null.c b/stream/stream_null.c
index 0d3efd9015..8bae12ff9d 100644
--- a/stream/stream_null.c
+++ b/stream/stream_null.c
@@ -1,6 +1,8 @@
/*
* This file is part of MPlayer.
*
+ * Original author: Albeu
+ *
* 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
@@ -30,10 +32,7 @@ static int open_s(stream_t *stream,int mode, void* opts)
const stream_info_t stream_info_null = {
- "Null stream",
"null",
- "Albeu",
- "",
open_s,
{ "null", NULL },
NULL,
diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c
index 0b5f188c9e..6038ee9221 100644
--- a/stream/stream_pvr.c
+++ b/stream/stream_pvr.c
@@ -1757,10 +1757,7 @@ pvr_force_freq_step (stream_t *stream, int step)
}
const stream_info_t stream_info_pvr = {
- "V4L2 MPEG Input (a.k.a PVR)",
"pvr",
- "Benjamin Zores",
- "",
pvr_stream_open,
{ "pvr", NULL },
NULL,
diff --git a/stream/stream_radio.c b/stream/stream_radio.c
index 7e54cd4274..dd173175f0 100644
--- a/stream/stream_radio.c
+++ b/stream/stream_radio.c
@@ -968,10 +968,7 @@ static void close_s(struct stream *stream){
}
const stream_info_t stream_info_radio = {
- "Radio stream",
- "Radio",
- "Vladimir Voroshilov",
- "In development",
+ "radio",
open_s,
{ "radio", NULL },
&stream_opts,
diff --git a/stream/stream_smb.c b/stream/stream_smb.c
index 5c9a4a6b0b..91c5c615d7 100644
--- a/stream/stream_smb.c
+++ b/stream/stream_smb.c
@@ -1,6 +1,8 @@
/*
* This file is part of MPlayer.
*
+ * Original author: M. Tourne
+ *
* 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
@@ -188,10 +190,7 @@ static int open_f (stream_t *stream, int mode, void *opts)
}
const stream_info_t stream_info_smb = {
- "Server Message Block",
"smb",
- "M. Tourne",
- "based on the code from 'a bulgarian' (one says)",
open_f,
{"smb", NULL},
&stream_opts,
diff --git a/stream/stream_tv.c b/stream/stream_tv.c
index 937a299211..d9a4636b00 100644
--- a/stream/stream_tv.c
+++ b/stream/stream_tv.c
@@ -2,6 +2,7 @@
* stream layer for TV Input, based on previous work from Albeu
*
* Copyright (C) 2006 Benjamin Zores
+ * Original author: Albeu
*
* This file is part of MPlayer.
*
@@ -108,10 +109,7 @@ tv_stream_open (stream_t *stream, int mode, void *opts)
}
const stream_info_t stream_info_tv = {
- "TV Input",
"tv",
- "Benjamin Zores, Albeu",
- "",
tv_stream_open,
{ "tv", NULL },
&stream_opts,
diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c
index cd03b49744..be345a507b 100644
--- a/stream/stream_vcd.c
+++ b/stream/stream_vcd.c
@@ -1,6 +1,8 @@
/*
* This file is part of MPlayer.
*
+ * Original author: Albeu
+ *
* 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
@@ -202,10 +204,7 @@ static int open_s(stream_t *stream,int mode, void* opts)
}
const stream_info_t stream_info_vcd = {
- "Video CD",
"vcd",
- "Albeu",
- "based on the code from ???",
open_s,
{ "vcd", NULL },
&stream_opts,