demuxer.h: avoid including stream.h

Drop the unnecessary include and add a missing direct include in some
files. This also revealed that demux_rtp_internal.h was missing a
config.h include, fix that too.

libmpdemux/demux_rtp.cpp

@@ -25,8 +25,10 @@ extern "C" {
 #include <windows.h>  // windows.h, but not the other way around.
 #endif
 #include "demux_rtp.h"
+#include "stream/stream.h"
 #include "stheader.h"
 #include "options.h"
+#include "config.h"
 }
 #include "demux_rtp_internal.h"
 

libmpdemux/demux_rtp_internal.h

@@ -23,6 +23,7 @@
 
 extern "C" {
 #include "demuxer.h"
+#include "config.h"
 #ifdef CONFIG_FFMPEG
 #include "libavcodec/avcodec.h"
 #endif

libmpdemux/demuxer.h

@@ -25,7 +25,6 @@
 #include <string.h>
 #include <stdbool.h>
 
-#include "stream/stream.h"
 #include "bstr.h"
 #include "mpcommon.h"
 

timeline/tl_edl.c

@@ -29,6 +29,7 @@
 #include "path.h"
 #include "bstr.h"
 #include "mpcommon.h"
+#include "stream/stream.h"
 
 
 struct edl_source {

timeline/tl_matroska.c

@@ -31,6 +31,8 @@
 #include "path.h"
 #include "bstr.h"
 #include "mpcommon.h"
+#include "stream/stream.h"
+
 
 static char **find_files(const char *original_file, const char *suffix)
 {