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_pvr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'stream/stream_pvr.c')

diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c
index aeea46cf62..165a67ad37 100644
--- a/stream/stream_pvr.c
+++ b/stream/stream_pvr.c
@@ -1555,7 +1555,7 @@ pvr_stream_read (stream_t *stream, char *buffer, int size)
 }
 
 static int
-pvr_stream_open (stream_t *stream, int mode, void *opts, int *file_format)
+pvr_stream_open (stream_t *stream, int mode, void *opts)
 {
   struct v4l2_capability vcap;
   struct v4l2_ext_controls ctrls;
-- 
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_pvr.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'stream/stream_pvr.c')

diff --git a/stream/stream_pvr.c b/stream/stream_pvr.c
index 165a67ad37..0b5f188c9e 100644
--- a/stream/stream_pvr.c
+++ b/stream/stream_pvr.c
@@ -40,14 +40,15 @@
 #include <linux/types.h>
 #include <linux/videodev2.h>
 
+#include <libavutil/common.h>
+#include <libavutil/avstring.h>
+
 #include "core/mp_msg.h"
 
 #include "stream.h"
 #include "pvr.h"
 
 #include "frequencies.h"
-#include "libavutil/common.h"
-#include "libavutil/avstring.h"
 
 #define PVR_DEFAULT_DEVICE "/dev/video0"
 #define PVR_MAX_CONTROLS 10
-- 
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_pvr.c | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'stream/stream_pvr.c')

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