From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Date: Sun, 21 Feb 2010 02:43:37 +0000 (+0000)
Subject: v2.1d updates
X-Git-Tag: v2.4~261
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aebb535cf75cb5ade5cba4229fe21353afd2d264;p=rtmpdump

v2.1d updates


git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@259 400ebc74-4327-4243-bc38-086b20814532
---

diff --git a/Makefile b/Makefile
index 518d501..df18c64 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,14 @@
 CC=$(CROSS_COMPILE)gcc
 LD=$(CROSS_COMPILE)ld
 
-DEF=-DRTMPDUMP_VERSION=\"v2.1c\"
+DEF=-DRTMPDUMP_VERSION=\"v2.1d\"
 OPT=-O2
 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
 LDFLAGS=-Wall $(XLDFLAGS)
 LIBS=-lcrypto -lz
 THREADLIB=-lpthread
 SLIBS=$(THREADLIB) $(LIBS)
+RTMP_OBJS=rtmp.o log.o amf.o sig8.o
 
 EXT=
 
@@ -33,16 +34,16 @@ cross:
 clean:
 	rm -f *.o rtmpdump$(EXT) streams$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT)
 
-rtmpdump: log.o rtmp.o amf.o rtmpdump.o parseurl.o hashswf.o
+rtmpdump: rtmpdump.o $(RTMP_OBJS) parseurl.o hashswf.o
 	$(CC) $(LDFLAGS) $^ -o $@$(EXT) $(LIBS)
 
-rtmpsrv: log.o rtmp.o amf.o rtmpsrv.o thread.o
+rtmpsrv: rtmpsrv.o $(RTMP_OBJS) thread.o
 	$(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS)
 
-rtmpsuck: log.o rtmp.o amf.o rtmpsuck.o hashswf.o thread.o
+rtmpsuck: rtmpsuck.o $(RTMP_OBJS) hashswf.o thread.o
 	$(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS)
 
-streams: log.o rtmp.o amf.o streams.o parseurl.o hashswf.o thread.o
+streams: streams.o $(RTMP_OBJS) parseurl.o hashswf.o thread.o
 	$(CC) $(LDFLAGS) $^ -o $@$(EXT) $(SLIBS)
 
 log.o: log.c log.h Makefile
@@ -54,3 +55,4 @@ rtmpdump.o: rtmpdump.c rtmp.h log.h amf.h Makefile
 rtmpsrv.o: rtmpsrv.c rtmp.h log.h amf.h Makefile
 hashswf.o: hashswf.c http.h
 thread.o: thread.c thread.h
+sig8.o: sig8.c
diff --git a/README b/README
index ac3ceae..994e0aa 100644
--- a/README
+++ b/README
@@ -1,18 +1,22 @@
-RTMP Dump v2.1c
+RTMP Dump v2.1d
 (C) 2009 Andrej Stepanchuk
 (C) 2009-2010 Howard Chu
 License: GPLv2
 http://rtmpdump.mplayerhq.hu/
 
-To compile type "make" with your platform name, e.g.
+To compile type "make" with platform name, e.g.
 
-  $ make linux
+  $ make posix
 
-or osx, mingw, or cygwin.
+for Linux, MacOSX, Unix, etc. or
 
-You can cross-compile for ARM using
+  $ make mingw
 
-  $ make arm
+for Windows.
+
+You can cross-compile for other platforms using
+
+  $ make cross
 
 but you may need to override the CROSS_COMPILE and INC variables, e.g.
 
@@ -40,9 +44,10 @@ and use the --swfhash "01234..." option to pass it.
 
 e.g. $ ./rtmpdump --swfhash "123456..." --swfsize 987...
 
-Note: all of this is now done automatically if you provide the SWF URL using
-the -W (--swfVfy) option instead of the -s (--swfUrl) option. Also, the hash info
-is cached in ~/.swfinfo so it doesn't need to be recalculated all the time.
+Note: all of this is done automatically if you provide the SWF URL using
+the -W (--swfVfy) option instead of the -s (--swfUrl) option. Also, the
+hash info is cached in ~/.swfinfo so it doesn't need to be ecalculated
+all the time.
 
 Connect Parameters
 ------------------
@@ -98,9 +103,10 @@ Three different types of servers are also present in this distribution:
  streams - an RTMP to HTTP gateway
 
 rtmpsrv - Note that this is very incomplete code, and I haven't yet decided
-whether or not to finish it. In its current form it is useful for obtaining
-all the parameters that a real Flash client would send to an RTMP server, so
-that they can be used with rtmpdump.
+whether or not to finish it. It is useful for obtaining all the parameters
+that a real Flash client would send to an RTMP server, so that they can be
+used with rtmpdump. The current version now invokes rtmpdump automatically
+after parsing a client request.
 
 rtmpsuck - proxy server. See below...