From 1327eeb375064573d5b9b3657958614ab297c2b1 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 27 Jun 2013 17:21:46 +0200
Subject: stream: redo memory streams

Make memory streams actual streams. This causes fewer weird corner cases
and actually allows using demuxers with them.
---
 stream/stream.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'stream/stream.c')

diff --git a/stream/stream.c b/stream/stream.c
index 6b015ff2fd..13afb64f98 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -78,6 +78,7 @@ extern const stream_info_t stream_info_vstream;
 extern const stream_info_t stream_info_smb;
 
 extern const stream_info_t stream_info_null;
+extern const stream_info_t stream_info_memory;
 extern const stream_info_t stream_info_mf;
 extern const stream_info_t stream_info_ffmpeg;
 extern const stream_info_t stream_info_avdevice;
@@ -130,6 +131,7 @@ static const stream_info_t *const auto_open_streams[] = {
     &stream_info_bluray,
 #endif
 
+    &stream_info_memory,
     &stream_info_null,
     &stream_info_mf,
     &stream_info_file,
@@ -725,14 +727,9 @@ int stream_check_interrupt(int time)
 stream_t *open_memory_stream(void *data, int len)
 {
     assert(len >= 0);
-    stream_t *s = new_stream(len);
-
-    s->buf_pos = 0;
-    s->buf_len = len;
-    s->start_pos = 0;
-    s->end_pos = len;
-    s->pos = len;
-    memcpy(s->buffer, data, len);
+    stream_t *s = open_stream("memory://", NULL, NULL);
+    assert(s);
+    stream_control(s, STREAM_CTRL_SET_CONTENTS, &(bstr){data, len});
     return s;
 }
 
-- 
cgit v1.2.3