[MPlayer-cvslog] r18802 - in trunk/libmpdemux: Makefile librtsp librtsp/rtsp.c librtsp/rtsp.h librtsp/rtsp_session.c librtsp/rtsp_session.h realrtsp/real.h realrtsp/rtsp.c realrtsp/rtsp.h realrtsp/rtsp_session.c realrtsp/rtsp_session.h realrtsp/sdpplin.c realrtsp/sdpplin.h rtsp.c

[ben]

Author: ben
Date: Fri Jun 23 23:38:28 2006
New Revision: 18802

Added:
   trunk/libmpdemux/librtsp/
   trunk/libmpdemux/librtsp/rtsp.c
      - copied unchanged from r18798, /trunk/libmpdemux/realrtsp/rtsp.c
   trunk/libmpdemux/librtsp/rtsp.h
      - copied unchanged from r18796, /trunk/libmpdemux/realrtsp/rtsp.h
   trunk/libmpdemux/librtsp/rtsp_session.c
      - copied, changed from r18801, /trunk/libmpdemux/realrtsp/rtsp_session.c
   trunk/libmpdemux/librtsp/rtsp_session.h
      - copied unchanged from r18801, /trunk/libmpdemux/realrtsp/rtsp_session.h
Removed:
   trunk/libmpdemux/realrtsp/rtsp.c
   trunk/libmpdemux/realrtsp/rtsp.h
   trunk/libmpdemux/realrtsp/rtsp_session.c
   trunk/libmpdemux/realrtsp/rtsp_session.h
Modified:
   trunk/libmpdemux/Makefile
   trunk/libmpdemux/realrtsp/real.h
   trunk/libmpdemux/realrtsp/sdpplin.c
   trunk/libmpdemux/realrtsp/sdpplin.h
   trunk/libmpdemux/rtsp.c

Log:
moved generic rtsp related files from realrtsp to librtsp

Modified: trunk/libmpdemux/Makefile
==============================================================================
--- trunk/libmpdemux/Makefile	(original)
+++ trunk/libmpdemux/Makefile	Fri Jun 23 23:38:28 2006
@@ -135,11 +135,12 @@
 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 @@
 	  $(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

Copied: trunk/libmpdemux/librtsp/rtsp_session.c (from r18801, /trunk/libmpdemux/realrtsp/rtsp_session.c)
==============================================================================
--- /trunk/libmpdemux/realrtsp/rtsp_session.c	(original)
+++ trunk/libmpdemux/librtsp/rtsp_session.c	Fri Jun 23 23:38:28 2006
@@ -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

Modified: trunk/libmpdemux/realrtsp/real.h
==============================================================================
--- trunk/libmpdemux/realrtsp/real.h	(original)
+++ trunk/libmpdemux/realrtsp/real.h	Fri Jun 23 23:38:28 2006
@@ -31,7 +31,7 @@
 #define HAVE_REAL_H
 
 #include "rmff.h"
-#include "rtsp.h"
+#include "../librtsp/rtsp.h"
 
 #define HEADER_SIZE 4096
 

Modified: trunk/libmpdemux/realrtsp/sdpplin.c
==============================================================================
--- trunk/libmpdemux/realrtsp/sdpplin.c	(original)
+++ trunk/libmpdemux/realrtsp/sdpplin.c	Fri Jun 23 23:38:28 2006
@@ -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"

Modified: trunk/libmpdemux/realrtsp/sdpplin.h
==============================================================================
--- trunk/libmpdemux/realrtsp/sdpplin.h	(original)
+++ trunk/libmpdemux/realrtsp/sdpplin.h	Fri Jun 23 23:38:28 2006
@@ -30,7 +30,7 @@
 #define HAVE_SDPPLIN_H
 
 #include "rmff.h"
-#include "rtsp.h"
+#include "../librtsp/rtsp.h"
 
 typedef struct {
 

Modified: trunk/libmpdemux/rtsp.c
==============================================================================
--- trunk/libmpdemux/rtsp.c	(original)
+++ trunk/libmpdemux/rtsp.c	Fri Jun 23 23:38:28 2006
@@ -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