summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-27 12:48:11 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-02-27 12:48:11 +0000
commit01c5a73c5359fb71c1d394194969b1eeb55575b0 (patch)
treecadec44665e8f9a8a9dc75d28716a076bbffacf7 /libmpdemux
parent664e5bb9b8519f0474c40db472c06a7c5d5f4245 (diff)
downloadmpv-01c5a73c5359fb71c1d394194969b1eeb55575b0.tar.bz2
mpv-01c5a73c5359fb71c1d394194969b1eeb55575b0.tar.xz
Remove pointless #ifdef checks for DEMUXER_H, which is never set.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30759 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_rtp.h3
-rw-r--r--libmpdemux/demux_rtp_internal.h2
2 files changed, 0 insertions, 5 deletions
diff --git a/libmpdemux/demux_rtp.h b/libmpdemux/demux_rtp.h
index 7273afc3be..6d3462d856 100644
--- a/libmpdemux/demux_rtp.h
+++ b/libmpdemux/demux_rtp.h
@@ -21,10 +21,7 @@
#include <stdlib.h>
#include <stdio.h>
-
-#ifndef DEMUXER_H
#include "demuxer.h"
-#endif
// Open a RTP demuxer (which was initiated either from a SDP file,
// or from a RTSP URL):
diff --git a/libmpdemux/demux_rtp_internal.h b/libmpdemux/demux_rtp_internal.h
index 88b1f7e98b..fb8f582b53 100644
--- a/libmpdemux/demux_rtp_internal.h
+++ b/libmpdemux/demux_rtp_internal.h
@@ -22,9 +22,7 @@
#include <stdlib.h>
extern "C" {
-#ifndef DEMUXER_H
#include "demuxer.h"
-#endif
#ifdef CONFIG_LIBAVCODEC
#include "libavcodec/avcodec.h"
#endif