From 52c3eb69765a0d1070bf240353095c8ff546765b Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 11 Jul 2013 21:10:42 +0200
Subject: core: change open_stream and demux_open signature

This removes the dependency on DEMUXER_TYPE_* and the file_format
parameter from the stream open functions.

Remove some of the playlist handling code. It looks like this was
needed only for loading linked mov files with demux_mov (which was
removed long ago).

Delete a minor bit of dead network-related code from stream.c as well.
---
 stream/stream_dvd.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'stream/stream_dvd.c')

diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index bf9cb9d4c7..b8161d16fa 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -745,7 +745,8 @@ static int control(stream_t *stream,int cmd,void* arg)
 }
 
 
-static int open_s(stream_t *stream,int mode, void* opts, int* file_format) {
+static int open_s(stream_t *stream,int mode, void* opts)
+{
   struct stream_priv_s* p = (struct stream_priv_s*)opts;
   int k;
 
@@ -1059,7 +1060,7 @@ fail:
   return STREAM_UNSUPPORTED;
 }
 
-static int ifo_stream_open (stream_t *stream, int mode, void *opts, int *file_format)
+static int ifo_stream_open (stream_t *stream, int mode, void *opts)
 {
     char* filename;
     struct stream_priv_s *spriv;
@@ -1085,7 +1086,7 @@ static int ifo_stream_open (stream_t *stream, int mode, void *opts, int *file_fo
     free(stream->url);
     stream->url=strdup("dvd://");
 
-    return open_s(stream, mode, spriv, file_format);
+    return open_s(stream, mode, spriv);
 }
 
 const stream_info_t stream_info_dvd = {
-- 
cgit v1.2.3


From f406482d84b8597235e17bedfb7539a5863d869e Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 12 Jul 2013 22:11:08 +0200
Subject: 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.
---
 stream/stream_dvd.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'stream/stream_dvd.c')

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,
-- 
cgit v1.2.3