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_null.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'stream/stream_null.c')

diff --git a/stream/stream_null.c b/stream/stream_null.c
index 5465702be8..c1965e6bd0 100644
--- a/stream/stream_null.c
+++ b/stream/stream_null.c
@@ -23,7 +23,8 @@
 
 #include "stream.h"
 
-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)
+{
   stream->type = STREAMTYPE_DUMMY;
 
   return 1;
-- 
cgit v1.2.3


From 5c1b8d4aa1d35c806159cb22d52449774eb5186e Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 12 Jul 2013 22:05:43 +0200
Subject: stream: don't require streams to set a type

Set the type only for streams that have special treatment in other parts
of the code.
---
 stream/stream_null.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'stream/stream_null.c')

diff --git a/stream/stream_null.c b/stream/stream_null.c
index c1965e6bd0..0d3efd9015 100644
--- a/stream/stream_null.c
+++ b/stream/stream_null.c
@@ -25,8 +25,6 @@
 
 static int open_s(stream_t *stream,int mode, void* opts)
 {
-  stream->type = STREAMTYPE_DUMMY;
-
   return 1;
 }
 
-- 
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_null.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'stream/stream_null.c')

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