diff --git a/stream/stream_ffmpeg.c b/stream/stream_ffmpeg.c
index 37c0800..03beb4f 100644
--- a/stream/stream_ffmpeg.c
+++ b/stream/stream_ffmpeg.c
@@ -130,7 +130,7 @@ const stream_info_t stream_info_ffmpeg = {
   "",
   "",
   open_f,
-  { "ffmpeg", "rtmp", NULL },
+  { "ffmpeg", NULL },
   NULL,
   1 // Urls are an option string
 };
diff --git a/stream/stream_rtmp.c b/stream/stream_rtmp.c
index 6acc4e0..82cf696 100644
--- a/stream/stream_rtmp.c
+++ b/stream/stream_rtmp.c
@@ -139,6 +139,7 @@ static int rtmp_stream_open(stream_t *stream, int mode, void *opts,
     char *host = NULL;
     unsigned char hash[HASHLEN];
     extern int network_bandwidth;
+    extern int RTMP_debuglevel;
     char *ptr, *p1, *p2;
 
     mp_msg(MSGT_OPEN, MSGL_INFO, "STREAM_RTMP, URL: %s\n", stream->url);
@@ -147,6 +148,8 @@ static int rtmp_stream_open(stream_t *stream, int mode, void *opts,
         goto fail;
     }
 
+    RTMP_debuglevel = 3 + verbose;
+
     ptr = strchr(stream->url, ' ');
     if (ptr) {
         m_struct_t *desc = (m_struct_t *) & stream_opts;
@@ -240,7 +243,7 @@ static int rtmp_stream_open(stream_t *stream, int mode, void *opts,
         .streaming_read = rtmp_stream_read,
         .streaming_seek = NULL,
         .prebuffer_size = 128 * 1024,
-        .buffering      = 1,
+        .buffering      = 0,
         .status         = streaming_playing_e,
     };
 
@@ -251,8 +254,13 @@ static int rtmp_stream_open(stream_t *stream, int mode, void *opts,
     stream->type    = STREAMTYPE_STREAM;
     stream->priv    = rs;
 
-    *file_format = DEMUXER_TYPE_LAVF_PREFERRED;
-    fixup_network_stream_cache(stream);
+    *file_format = DEMUXER_TYPE_LAVF;
+    {
+        extern const m_option_t lavfdopts_conf[];
+        m_option_t *opt = m_option_list_find(lavfdopts_conf, "format");
+        m_option_parse(opt, opt->name, "flv", opt->p, M_CONFIG_FILE);
+    }
+    /* fixup_network_stream_cache(stream); */
 
     return STREAM_OK;