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_avdevice.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'stream/stream_avdevice.c')

diff --git a/stream/stream_avdevice.c b/stream/stream_avdevice.c
index e26d5a9060..bd342e1b10 100644
--- a/stream/stream_avdevice.c
+++ b/stream/stream_avdevice.c
@@ -26,15 +26,15 @@ static int fill_buffer(stream_t *s, char *buffer, int max_len)
     return -1;
 }
 
-static int open_f(stream_t *stream, int mode, void *opts, int *file_format)
+static int open_f(stream_t *stream, int mode, void *opts)
 {
     if (mode != STREAM_READ)
         return STREAM_ERROR;
 
     stream->fill_buffer = fill_buffer;
     stream->type = STREAMTYPE_AVDEVICE;
+    stream->demuxer = "lavf";
 
-    *file_format = DEMUXER_TYPE_LAVF;
     return STREAM_OK;
 }
 
-- 
cgit v1.2.3


From cb45b1c65b2fe4644342db202e5f7b9fb64f2488 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 12 Jul 2013 22:04:44 +0200
Subject: Cleanup some include statements

---
 stream/stream_avdevice.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'stream/stream_avdevice.c')

diff --git a/stream/stream_avdevice.c b/stream/stream_avdevice.c
index bd342e1b10..eca5a6637a 100644
--- a/stream/stream_avdevice.c
+++ b/stream/stream_avdevice.c
@@ -19,7 +19,6 @@
 #include "config.h"
 
 #include "stream.h"
-#include "demux/demux.h"
 
 static int fill_buffer(stream_t *s, char *buffer, int max_len)
 {
-- 
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_avdevice.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'stream/stream_avdevice.c')

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