summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-12 22:12:02 +0200
committerwm4 <wm4@nowhere>2013-07-12 22:16:27 +0200
commit6c414f8c7a66ce3bb0c2446cb7fb0fb802a9e98b (patch)
treef2d8ad0735c87b3186992ad37533c55a865dc19d /demux
parentf406482d84b8597235e17bedfb7539a5863d869e (diff)
downloadmpv-6c414f8c7a66ce3bb0c2446cb7fb0fb802a9e98b.tar.bz2
mpv-6c414f8c7a66ce3bb0c2446cb7fb0fb802a9e98b.tar.xz
demux: remove useless author/comment fields
Same deal as with previous commit.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux.c17
-rw-r--r--demux/demux.h5
-rw-r--r--demux/demux_cue.c7
-rw-r--r--demux/demux_edl.c7
-rw-r--r--demux/demux_lavf.c5
-rw-r--r--demux/demux_libass.c5
-rw-r--r--demux/demux_mf.c5
-rw-r--r--demux/demux_mkv.c5
-rw-r--r--demux/demux_mng.c5
-rw-r--r--demux/demux_rawaudio.c5
-rw-r--r--demux/demux_rawvideo.c5
-rw-r--r--demux/demux_subreader.c5
12 files changed, 20 insertions, 56 deletions
diff --git a/demux/demux.c b/demux/demux.c
index 61e0f2e9ef..836c945bc4 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -309,8 +309,6 @@ static void free_sh_stream(struct sh_stream *sh)
void free_demuxer(demuxer_t *demuxer)
{
- mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing %s demuxer at %p\n",
- demuxer->desc->shortdesc, demuxer);
if (demuxer->desc->close)
demuxer->desc->close(demuxer);
// free streams:
@@ -502,16 +500,11 @@ void demuxer_help(void)
int i;
mp_msg(MSGT_DEMUXER, MSGL_INFO, "Available demuxers:\n");
- mp_msg(MSGT_DEMUXER, MSGL_INFO, " demuxer: info: (comment)\n");
+ mp_msg(MSGT_DEMUXER, MSGL_INFO, " demuxer: info:\n");
mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DEMUXERS\n");
for (i = 0; demuxer_list[i]; i++) {
- if (demuxer_list[i]->comment && strlen(demuxer_list[i]->comment))
- mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %s (%s)\n",
- demuxer_list[i]->name, demuxer_list[i]->info,
- demuxer_list[i]->comment);
- else
- mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %s\n",
- demuxer_list[i]->name, demuxer_list[i]->info);
+ mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %s\n",
+ demuxer_list[i]->name, demuxer_list[i]->desc);
}
}
@@ -556,10 +549,10 @@ static struct demuxer *open_given_type(struct MPOpts *opts,
demuxer->params = NULL;
if (demuxer->filetype)
mp_tmsg(MSGT_DEMUXER, MSGL_INFO, "Detected file format: %s (%s)\n",
- demuxer->filetype, desc->shortdesc);
+ demuxer->filetype, desc->desc);
else
mp_tmsg(MSGT_DEMUXER, MSGL_INFO, "Detected file format: %s\n",
- desc->shortdesc);
+ desc->desc);
if (stream_manages_timeline(demuxer->stream)) {
// Incorrect, but fixes some behavior with DVD/BD
demuxer->ts_resets_possible = false;
diff --git a/demux/demux.h b/demux/demux.h
index 34ff9fd596..3f193fa72e 100644
--- a/demux/demux.h
+++ b/demux/demux.h
@@ -98,11 +98,8 @@ struct demuxer;
* Demuxer description structure
*/
typedef struct demuxer_desc {
- const char *info; // What is it (long name and/or description)
const char *name; // Demuxer name, used with -demuxer switch
- const char *shortdesc; // Description printed at demuxer detection
- const char *author; // Demuxer author(s)
- const char *comment; // Comment, printed with -demuxer help
+ const char *desc; // Displayed to user
enum demuxer_type type; // optional
diff --git a/demux/demux_cue.c b/demux/demux_cue.c
index db2f40ea57..4d2c03dcce 100644
--- a/demux/demux_cue.c
+++ b/demux/demux_cue.c
@@ -1,6 +1,8 @@
/*
* This file is part of MPlayer.
*
+ * Original author: Uoti Urpala
+ *
* 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
@@ -48,11 +50,8 @@ static int try_open_file(struct demuxer *demuxer, enum demux_check check)
}
const struct demuxer_desc demuxer_desc_cue = {
- .info = "CUE file demuxer",
.name = "cue",
- .shortdesc = "CUE",
- .author = "Uoti Urpala",
- .comment = "",
+ .desc = "CUE sheet",
.type = DEMUXER_TYPE_CUE,
.open = try_open_file,
};
diff --git a/demux/demux_edl.c b/demux/demux_edl.c
index 0f4bf06dbf..5c6afa2d9b 100644
--- a/demux/demux_edl.c
+++ b/demux/demux_edl.c
@@ -1,6 +1,8 @@
/*
* This file is part of MPlayer.
*
+ * Original author: Uoti Urpala
+ *
* 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
@@ -43,11 +45,8 @@ static int try_open_file(struct demuxer *demuxer, enum demux_check check)
}
const struct demuxer_desc demuxer_desc_edl = {
- .info = "EDL file demuxer",
.name = "edl",
- .shortdesc = "EDL",
- .author = "Uoti Urpala",
- .comment = "",
+ .desc = "mplayer2 edit decision list",
.type = DEMUXER_TYPE_EDL,
.open = try_open_file,
};
diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c
index 88587f8ce0..e788b5b77c 100644
--- a/demux/demux_lavf.c
+++ b/demux/demux_lavf.c
@@ -902,11 +902,8 @@ static void demux_close_lavf(demuxer_t *demuxer)
const demuxer_desc_t demuxer_desc_lavf = {
- .info = "libavformat demuxer",
.name = "lavf",
- .shortdesc = "libavformat",
- .author = "Michael Niedermayer",
- .comment = "supports many formats, requires libavformat",
+ .desc = "libavformat",
.fill_buffer = demux_lavf_fill_buffer,
.open = demux_open_lavf,
.close = demux_close_lavf,
diff --git a/demux/demux_libass.c b/demux/demux_libass.c
index 24e1b9e114..1dc8e92eb0 100644
--- a/demux/demux_libass.c
+++ b/demux/demux_libass.c
@@ -112,11 +112,8 @@ static void d_close(struct demuxer *demuxer)
}
const struct demuxer_desc demuxer_desc_libass = {
- .info = "Read subtitles with libass",
.name = "libass",
- .shortdesc = "ASS/SSA subtitles (libass)",
- .author = "",
- .comment = "",
+ .desc = "ASS/SSA subtitles (libass)",
.open = d_check_file,
.close = d_close,
};
diff --git a/demux/demux_mf.c b/demux/demux_mf.c
index 33747f12d7..5c92476c82 100644
--- a/demux/demux_mf.c
+++ b/demux/demux_mf.c
@@ -244,11 +244,8 @@ static int demux_control_mf(demuxer_t *demuxer, int cmd, void *arg) {
}
const demuxer_desc_t demuxer_desc_mf = {
- .info = "mf demuxer",
.name = "mf",
- .shortdesc = "MF",
- .author = "?",
- .comment = "multiframe?, pictures demuxer",
+ .desc = "image files (mf)",
.fill_buffer = demux_mf_fill_buffer,
.open = demux_open_mf,
.close = demux_close_mf,
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index efc4c8f989..3fb57423a8 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -2718,11 +2718,8 @@ static int demux_mkv_control(demuxer_t *demuxer, int cmd, void *arg)
}
const demuxer_desc_t demuxer_desc_matroska = {
- .info = "Matroska demuxer",
.name = "mkv",
- .shortdesc = "Matroska",
- .author = "Aurelien Jacobs",
- .comment = "",
+ .desc = "Matroska",
.type = DEMUXER_TYPE_MATROSKA,
.open = demux_mkv_open,
.fill_buffer = demux_mkv_fill_buffer,
diff --git a/demux/demux_mng.c b/demux/demux_mng.c
index 6c5bbc2e45..ea82ab257f 100644
--- a/demux/demux_mng.c
+++ b/demux/demux_mng.c
@@ -560,11 +560,8 @@ static int demux_mng_control(demuxer_t * demuxer, int cmd, void * arg)
}
const demuxer_desc_t demuxer_desc_mng = {
- .info = "MNG demuxer",
.name = "mng",
- .shortdesc = "MNG",
- .author = "Stefan Schuermans <stefan@blinkenarea.org>",
- .comment = "MNG files, using libmng",
+ .desc = "MNG",
.fill_buffer = demux_mng_fill_buffer,
.open = demux_mng_open,
.close = demux_mng_close,
diff --git a/demux/demux_rawaudio.c b/demux/demux_rawaudio.c
index 83a89e7c1c..54e7b1b939 100644
--- a/demux/demux_rawaudio.c
+++ b/demux/demux_rawaudio.c
@@ -114,11 +114,8 @@ static void demux_rawaudio_seek(demuxer_t *demuxer,float rel_seek_secs,float aud
}
const demuxer_desc_t demuxer_desc_rawaudio = {
- .info = "Raw audio demuxer",
.name = "rawaudio",
- .shortdesc = "rawaudio",
- .author = "?",
- .comment = "",
+ .desc = "Uncompressed audio",
.fill_buffer = demux_rawaudio_fill_buffer,
.open = demux_rawaudio_open,
.seek = demux_rawaudio_seek,
diff --git a/demux/demux_rawvideo.c b/demux/demux_rawvideo.c
index 9f670f2879..dc0c3aaee8 100644
--- a/demux/demux_rawvideo.c
+++ b/demux/demux_rawvideo.c
@@ -170,11 +170,8 @@ static void demux_rawvideo_seek(demuxer_t *demuxer,float rel_seek_secs,float aud
const demuxer_desc_t demuxer_desc_rawvideo = {
- .info = "Raw video demuxer",
.name = "rawvideo",
- .shortdesc = "rawvideo",
- .author = "?",
- .comment = "",
+ .desc = "Uncompressed video",
.fill_buffer = demux_rawvideo_fill_buffer,
.open = demux_rawvideo_open,
.seek = demux_rawvideo_seek,
diff --git a/demux/demux_subreader.c b/demux/demux_subreader.c
index 24604978d5..084d7857d9 100644
--- a/demux/demux_subreader.c
+++ b/demux/demux_subreader.c
@@ -1391,11 +1391,8 @@ static int d_control(struct demuxer *demuxer, int cmd, void *arg)
}
const struct demuxer_desc demuxer_desc_subreader = {
- .info = "Deprecated MPlayer subtitle reader",
.name = "subreader",
- .shortdesc = "Deprecated Subreader",
- .author = "",
- .comment = "",
+ .desc = "Deprecated MPlayer subreader",
.open = d_open_file,
.fill_buffer = d_fill_buffer,
.seek = d_seek,