summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_rtp_internal.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 02:14:30 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-10 02:35:02 +0200
commitbc1d0ca37d9bdfd69a945043650e0246ffeb5f94 (patch)
tree8269c9cbc1df72afb5715b77669698a0781f6250 /libmpdemux/demux_rtp_internal.h
parentf7cc4152f7c55808c5dd6bbd49c216c9345eb686 (diff)
parente9a5e7f667d1b0c0dec0053ad9ec6f7bc3162b60 (diff)
downloadmpv-bc1d0ca37d9bdfd69a945043650e0246ffeb5f94.tar.bz2
mpv-bc1d0ca37d9bdfd69a945043650e0246ffeb5f94.tar.xz
Merge svn changes up to r30798
Diffstat (limited to 'libmpdemux/demux_rtp_internal.h')
-rw-r--r--libmpdemux/demux_rtp_internal.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/libmpdemux/demux_rtp_internal.h b/libmpdemux/demux_rtp_internal.h
index 77f0364918..fb8f582b53 100644
--- a/libmpdemux/demux_rtp_internal.h
+++ b/libmpdemux/demux_rtp_internal.h
@@ -22,12 +22,7 @@
#include <stdlib.h>
extern "C" {
-#ifndef STREAM_H
-#include "stream/stream.h"
-#endif
-#ifndef DEMUXER_H
#include "demuxer.h"
-#endif
#ifdef CONFIG_LIBAVCODEC
#include "libavcodec/avcodec.h"
#endif