From 3043beffab4cb93f33720ea97a962f16dd9e16df Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Fri, 19 Aug 2011 05:36:27 +0300 Subject: 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 | 2 ++ libmpdemux/demux_rtp_internal.h | 1 + libmpdemux/demuxer.h | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'libmpdemux') diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp index c9c950de8a..6799843ee0 100644 --- a/libmpdemux/demux_rtp.cpp +++ b/libmpdemux/demux_rtp.cpp @@ -25,8 +25,10 @@ extern "C" { #include // 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" diff --git a/libmpdemux/demux_rtp_internal.h b/libmpdemux/demux_rtp_internal.h index 7ff4d77a85..3c17a1e42f 100644 --- a/libmpdemux/demux_rtp_internal.h +++ b/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 diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 6f51dc76dc..5585cf73ed 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -25,7 +25,6 @@ #include #include -#include "stream/stream.h" #include "bstr.h" #include "mpcommon.h" -- cgit v1.2.3