diff options
-rw-r--r-- | libmpdemux/Makefile | 9 | ||||
-rw-r--r-- | libmpdemux/librtsp/rtsp.c (renamed from libmpdemux/realrtsp/rtsp.c) | 0 | ||||
-rw-r--r-- | libmpdemux/librtsp/rtsp.h (renamed from libmpdemux/realrtsp/rtsp.h) | 0 | ||||
-rw-r--r-- | libmpdemux/librtsp/rtsp_session.c (renamed from libmpdemux/realrtsp/rtsp_session.c) | 8 | ||||
-rw-r--r-- | libmpdemux/librtsp/rtsp_session.h (renamed from libmpdemux/realrtsp/rtsp_session.h) | 0 | ||||
-rw-r--r-- | libmpdemux/realrtsp/real.h | 2 | ||||
-rw-r--r-- | libmpdemux/realrtsp/sdpplin.c | 2 | ||||
-rw-r--r-- | libmpdemux/realrtsp/sdpplin.h | 2 | ||||
-rw-r--r-- | libmpdemux/rtsp.c | 4 |
9 files changed, 15 insertions, 12 deletions
diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index 2157e15900..ab32d53a61 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -135,11 +135,12 @@ SRCS += asf_streaming.c \ SRCS += realrtsp/asmrp.c \ realrtsp/real.c \ realrtsp/rmff.c \ - realrtsp/rtsp.c \ - realrtsp/rtsp_session.c \ realrtsp/sdpplin.c \ realrtsp/xbuffer.c \ +SRCS += librtsp/rtsp.c \ + librtsp/rtsp_session.c \ + ifeq ($(STREAMING_LIVE555),yes) CPLUSPLUSSRCS = demux_rtp.cpp demux_rtp_codec.cpp CPLUSPLUSINCLUDE = $(LIVE_INCLUDES) @@ -185,7 +186,9 @@ test: $(LIBNAME) test.c $(ALSA_LIB) $(VORBIS_LIB) $(CDPARANOIA_LIB) -lz -lpthread clean: - rm -f *.o *.a *~ realrtsp/*.o realrtsp/*.a realrtsp/*~ + rm -f *.o *.a *~ \ + realrtsp/*.o realrtsp/*.a realrtsp/*~ \ + librtsp/*.o librtsp/*.a librtsp/*~ distclean: clean rm -f .depend test diff --git a/libmpdemux/realrtsp/rtsp.c b/libmpdemux/librtsp/rtsp.c index 27d9dd37a5..27d9dd37a5 100644 --- a/libmpdemux/realrtsp/rtsp.c +++ b/libmpdemux/librtsp/rtsp.c diff --git a/libmpdemux/realrtsp/rtsp.h b/libmpdemux/librtsp/rtsp.h index 624c116bcb..624c116bcb 100644 --- a/libmpdemux/realrtsp/rtsp.h +++ b/libmpdemux/librtsp/rtsp.h diff --git a/libmpdemux/realrtsp/rtsp_session.c b/libmpdemux/librtsp/rtsp_session.c index 72ac13c455..1297014aba 100644 --- a/libmpdemux/realrtsp/rtsp_session.c +++ b/libmpdemux/librtsp/rtsp_session.c @@ -44,10 +44,10 @@ #include "mp_msg.h" #include "rtsp.h" #include "rtsp_session.h" -#include "real.h" -#include "rmff.h" -#include "asmrp.h" -#include "xbuffer.h" +#include "../realrtsp/real.h" +#include "../realrtsp/rmff.h" +#include "../realrtsp/asmrp.h" +#include "../realrtsp/xbuffer.h" /* #define LOG diff --git a/libmpdemux/realrtsp/rtsp_session.h b/libmpdemux/librtsp/rtsp_session.h index 8f6f3d3f4c..8f6f3d3f4c 100644 --- a/libmpdemux/realrtsp/rtsp_session.h +++ b/libmpdemux/librtsp/rtsp_session.h diff --git a/libmpdemux/realrtsp/real.h b/libmpdemux/realrtsp/real.h index 7fed8a239b..10b22065d7 100644 --- a/libmpdemux/realrtsp/real.h +++ b/libmpdemux/realrtsp/real.h @@ -31,7 +31,7 @@ #define HAVE_REAL_H #include "rmff.h" -#include "rtsp.h" +#include "../librtsp/rtsp.h" #define HEADER_SIZE 4096 diff --git a/libmpdemux/realrtsp/sdpplin.c b/libmpdemux/realrtsp/sdpplin.c index 56be87128b..34e5925d60 100644 --- a/libmpdemux/realrtsp/sdpplin.c +++ b/libmpdemux/realrtsp/sdpplin.c @@ -28,7 +28,7 @@ #include "config.h" #include "rmff.h" -#include "rtsp.h" +#include "../librtsp/rtsp.h" #include "sdpplin.h" #include "xbuffer.h" #include "mp_msg.h" diff --git a/libmpdemux/realrtsp/sdpplin.h b/libmpdemux/realrtsp/sdpplin.h index 8bb1af764e..2872a40f5e 100644 --- a/libmpdemux/realrtsp/sdpplin.h +++ b/libmpdemux/realrtsp/sdpplin.h @@ -30,7 +30,7 @@ #define HAVE_SDPPLIN_H #include "rmff.h" -#include "rtsp.h" +#include "../librtsp/rtsp.h" typedef struct { diff --git a/libmpdemux/rtsp.c b/libmpdemux/rtsp.c index adc857da1e..d39294c8b9 100644 --- a/libmpdemux/rtsp.c +++ b/libmpdemux/rtsp.c @@ -37,8 +37,8 @@ #include <errno.h> #include "stream.h" -#include "realrtsp/rtsp.h" -#include "realrtsp/rtsp_session.h" +#include "librtsp/rtsp.h" +#include "librtsp/rtsp_session.h" #define RTSP_DEFAULT_PORT 554 |