From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Date: Mon, 22 Mar 2010 09:40:25 +0000 (+0000)
Subject: v2.2b
X-Git-Tag: v2.4~156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a797bea97a12fc753d308f013308394b004870a6;p=rtmpdump

v2.2b


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

diff --git a/ChangeLog b/ChangeLog
index beb30e2..9f49697 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,15 @@ Copyright 2009-2010 Howard Chu
 Copyright 2009 The Flvstreamer Team
 http://rtmpdump.mplayerhq.hu/
 
+22 March 2010, v2.2b
+- fix v2.2a crashes in rtmpsrv/rtmpsuck
+- fix v2.2a .swfinfo location on Windows
+- fix typo for --auth parameter in manpages
+- add FP10 handshake support for rtmpsrv/rtmpsuck
+- avoid GNUMake vs BSDMake incompatibilities
+- add pkgconfig file for librtmp
+- more library cleanup
+
 20 March 2010, v2.2a
 - fix C++ compatibility for librtmp
 - misc library restructuring
diff --git a/Makefile b/Makefile
index 8c88861..0f8bde8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,25 @@
+VERSION=v2.2b
+
 CC=$(CROSS_COMPILE)gcc
 LD=$(CROSS_COMPILE)ld
 
-DEF=-DRTMPDUMP_VERSION=\"v2.2a\"
+CRYPTO=OPENSSL
+#CRYPTO=GNUTLS
+LIB_GNUTLS=-lgnutls
+LIB_OPENSSL=-lssl -lcrypto
+CRYPTO_LIB=$(LIB_$(CRYPTO))
+
+DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\"
 OPT=-O2
 CFLAGS=-Wall $(XCFLAGS) $(INC) $(DEF) $(OPT)
 LDFLAGS=-Wall $(XLDFLAGS)
-LIBS=-lssl -lcrypto -lz
-#LIBS=-lgnutls -lz
+
+LIBS=$(CRYPTO_LIB) -lz
 THREADLIB=-lpthread
+SLIBS=$(THREADLIB) $(LIBS)
+
 LIBRTMP=librtmp/librtmp.a
 INCRTMP=librtmp/rtmp_sys.h librtmp/rtmp.h librtmp/log.h librtmp/amf.h
-SLIBS=$(THREADLIB) $(LIBS)
 
 EXT=
 
diff --git a/README b/README
index a613540..a98259b 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-RTMP Dump v2.2a
+RTMP Dump v2.2b
 (C) 2009 Andrej Stepanchuk
 (C) 2009-2010 Howard Chu
 (C) 2010 2a665470ced7adb7156fcef47f8199a6371c117b8a79e399a2771e0b36384090
@@ -25,7 +25,8 @@ but you may need to override the CROSS_COMPILE and INC variables, e.g.
 
 Please read the Makefile to see what other make variables are used.
 
-This code also requires you to have OpenSSL and zlib installed.
+This code also requires you to have OpenSSL and zlib installed. (You may
+optionally use GnuTLS instead of OpenSSL if desired.)
 
 Credit goes to team boxee for the XBMC RTMP code originally used in RTMPDumper.
 The current code is based on the XBMC code but rewritten in C by Howard Chu.
diff --git a/librtmp/Makefile b/librtmp/Makefile
index b4965b5..8e037b5 100644
--- a/librtmp/Makefile
+++ b/librtmp/Makefile
@@ -1,3 +1,5 @@
+VERSION=v2.2b
+
 prefix=/usr/local
 
 CC=$(CROSS_COMPILE)gcc
@@ -11,7 +13,6 @@ REQ_GNUTLS=gnutls
 REQ_OPENSSL=libssl,libcrypto
 CRYPTO_LIB=$(LIB_$(CRYPTO))
 CRYPTO_REQ=$(REQ_$(CRYPTO))
-VERSION=v2.2a
 
 DEF=-DRTMPDUMP_VERSION=\"$(VERSION)\" -DUSE_$(CRYPTO)
 OPT=-O2