Mercurial > mplayer.hg

changeset 30717:c81fe45b1624

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove pointless #ifdef checks for DEMUXER_H, which is never set.
author diego
date Sat, 27 Feb 2010 12:48:11 +0000
parents e4ad2582ca37
children 4993c3f12cc0
files libmpdemux/demux_rtp.h libmpdemux/demux_rtp_internal.h
diffstat 2 files changed, 0 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_rtp.h	Sat Feb 27 12:45:12 2010 +0000
+++ b/libmpdemux/demux_rtp.h	Sat Feb 27 12:48:11 2010 +0000
@@ -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):
--- a/libmpdemux/demux_rtp_internal.h	Sat Feb 27 12:45:12 2010 +0000
+++ b/libmpdemux/demux_rtp_internal.h	Sat Feb 27 12:48:11 2010 +0000
@@ -22,9 +22,7 @@
 #include <stdlib.h>
 
 extern "C" {
-#ifndef DEMUXER_H
 #include "demuxer.h"
-#endif
 #ifdef CONFIG_LIBAVCODEC
 #include "libavcodec/avcodec.h"
 #endif