[MPlayer-cvslog] r30759 - in trunk/libmpdemux: demux_rtp.h demux_rtp_internal.h

[diego]

Author: diego
Date: Sat Feb 27 13:48:11 2010
New Revision: 30759

Log:
Remove pointless #ifdef checks for DEMUXER_H, which is never set.

Modified:
   trunk/libmpdemux/demux_rtp.h
   trunk/libmpdemux/demux_rtp_internal.h

Modified: trunk/libmpdemux/demux_rtp.h
==============================================================================
--- trunk/libmpdemux/demux_rtp.h	Sat Feb 27 13:45:12 2010	(r30758)
+++ trunk/libmpdemux/demux_rtp.h	Sat Feb 27 13:48:11 2010	(r30759)
@@ -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):

Modified: trunk/libmpdemux/demux_rtp_internal.h
==============================================================================
--- trunk/libmpdemux/demux_rtp_internal.h	Sat Feb 27 13:45:12 2010	(r30758)
+++ trunk/libmpdemux/demux_rtp_internal.h	Sat Feb 27 13:48:11 2010	(r30759)
@@ -22,9 +22,7 @@
 #include <stdlib.h>
 
 extern "C" {
-#ifndef DEMUXER_H
 #include "demuxer.h"
-#endif
 #ifdef CONFIG_LIBAVCODEC
 #include "libavcodec/avcodec.h"
 #endif