From abb06b3f11714de8b59f2482a9aec6447653f997 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 6 Jan 2010 16:11:29 +0000
Subject: Simplify ffmpeg stream support, we (so far) do not need any special
 option parsing.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30231 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 stream/stream_ffmpeg.c | 32 +++-----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

(limited to 'stream/stream_ffmpeg.c')

diff --git a/stream/stream_ffmpeg.c b/stream/stream_ffmpeg.c
index c681dc2c88..6dee2fcceb 100644
--- a/stream/stream_ffmpeg.c
+++ b/stream/stream_ffmpeg.c
@@ -7,28 +7,6 @@
 #include "m_option.h"
 #include "m_struct.h"
 
-static struct stream_priv_s {
-    char *filename;
-    char *filename2;
-} stream_priv_dflts = {
-    NULL, NULL
-};
-
-#define ST_OFF(f) M_ST_OFF(struct stream_priv_s,f)
-/// URL definition
-static const m_option_t stream_opts_fields[] = {
-    {"string",   ST_OFF(filename),  CONF_TYPE_STRING, 0, 0 ,0, NULL},
-    {"filename", ST_OFF(filename2), CONF_TYPE_STRING, 0, 0 ,0, NULL},
-    {NULL}
-};
-
-static const struct m_struct_st stream_opts = {
-    "ffmpeg",
-    sizeof(struct stream_priv_s),
-    &stream_priv_dflts,
-    stream_opts_fields
-};
-
 static int fill_buffer(stream_t *s, char *buffer, int max_len)
 {
     int r = url_read_complete(s->priv, buffer, max_len);
@@ -76,7 +54,6 @@ static int open_f(stream_t *stream, int mode, void *opts, int *file_format)
 {
     int flags = 0;
     const char *filename;
-    struct stream_priv_s *p = opts;
     URLContext *ctx = NULL;
     int res = STREAM_ERROR;
     int64_t size;
@@ -92,10 +69,8 @@ static int open_f(stream_t *stream, int mode, void *opts, int *file_format)
         goto out;
     }
 
-    if (p->filename)
-        filename = p->filename;
-    else if (p->filename2)
-        filename = p->filename2;
+    if (stream->url)
+        filename = stream->url;
     else {
         mp_msg(MSGT_OPEN, MSGL_ERR, "[ffmpeg] No URL\n");
         goto out;
@@ -124,7 +99,6 @@ static int open_f(stream_t *stream, int mode, void *opts, int *file_format)
     res = STREAM_OK;
 
 out:
-    m_struct_free(&stream_opts,opts);
     return res;
 }
 
@@ -135,6 +109,6 @@ const stream_info_t stream_info_ffmpeg = {
   "",
   open_f,
   { "ffmpeg", NULL },
-  &stream_opts,
+  NULL,
   1 // Urls are an option string
 };
-- 
cgit v1.2.3


From 78267a4d210cd374c49aa6a56f8e3a16e0aad4b5 Mon Sep 17 00:00:00 2001
From: reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 6 Jan 2010 16:12:58 +0000
Subject: Support rtmp:// URLs directly instead of requiring ffmpeg://rtmp://

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30232 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 stream/stream_ffmpeg.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'stream/stream_ffmpeg.c')

diff --git a/stream/stream_ffmpeg.c b/stream/stream_ffmpeg.c
index 6dee2fcceb..6aee8c63ee 100644
--- a/stream/stream_ffmpeg.c
+++ b/stream/stream_ffmpeg.c
@@ -108,7 +108,7 @@ const stream_info_t stream_info_ffmpeg = {
   "",
   "",
   open_f,
-  { "ffmpeg", NULL },
+  { "ffmpeg", "rtmp", NULL },
   NULL,
   1 // Urls are an option string
 };
-- 
cgit v1.2.3