From e683f329f3f81b959bb48253edc6df4cdbd5d5a0 Mon Sep 17 00:00:00 2001
From: hyc <hyc@400ebc74-4327-4243-bc38-086b20814532>
Date: Fri, 30 Apr 2010 00:31:59 +0000
Subject: [PATCH] Updates for 2.2d

git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@458 400ebc74-4327-4243-bc38-086b20814532
---
 ChangeLog        | 10 ++++++++++
 Makefile         |  2 +-
 README           | 20 +++++++++++++++++---
 librtmp/Makefile |  2 +-
 librtmp/rtmp.h   |  2 +-
 5 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 84269a6..ef7693b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,16 @@ Copyright 2009-2010 Howard Chu
 Copyright 2009 The Flvstreamer Team
 http://rtmpdump.mplayerhq.hu/
 
+29 April 2010, v2.2d
+- add RTMP_Alloc, RTMP_Free APIs
+- add optional support for polarssl instead of OpenSSL
+- add option to build crypto support without SSL/TLS
+- tweak handshake offset checking
+- add RTMP set_playlist command
+- check for (and fix) broken timestamps in FLV packets
+- fix tcUrl and playpath parsing in rtmpsrv and rtmpsuck
+- change internal boolean flags to bitmasks
+
 14 April 2010, v2.2c
 - internal restructuring, fix #undef CRYPTO builds
 - add RTMP_SetupURL, RTMP_SetOpt APIs
diff --git a/Makefile b/Makefile
index 6216f86..1d51a95 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=v2.2c
+VERSION=v2.2d
 
 CC=$(CROSS_COMPILE)gcc
 LD=$(CROSS_COMPILE)ld
diff --git a/README b/README
index 194eeb7..a0b9f1a 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-RTMP Dump v2.2c
+RTMP Dump v2.2d
 (C) 2009 Andrej Stepanchuk
 (C) 2009-2010 Howard Chu
 (C) 2010 2a665470ced7adb7156fcef47f8199a6371c117b8a79e399a2771e0b36384090
@@ -25,8 +25,22 @@ 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. (You may
-optionally use GnuTLS instead of OpenSSL if desired.)
+This code also requires you to have OpenSSL and zlib installed. You may
+optionally use GnuTLS or polarssl instead of OpenSSL if desired. You may
+also build with just rtmpe support, and no rtmps/https support, by
+specifying -DNO_SSL in the XDEF macro, e.g.
+
+  $ make posix XDEF=-DNO_SSL
+
+or
+
+  $ make posix CRYPTO=POLARSSL XDEF=-DNO_SSL
+
+You may also turn off all crypto support if desired
+
+  $ make posix CRYPTO=
+
+Note that if using OpenSSL, you must have version 0.9.8 or newer.
 
 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 08e43aa..985bb50 100644
--- a/librtmp/Makefile
+++ b/librtmp/Makefile
@@ -1,4 +1,4 @@
-VERSION=v2.2c
+VERSION=v2.2d
 
 prefix=/usr/local
 
diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h
index ef65cdb..4eab3e3 100644
--- a/librtmp/rtmp.h
+++ b/librtmp/rtmp.h
@@ -39,7 +39,7 @@ extern "C"
 {
 #endif
 
-#define RTMP_LIB_VERSION	0x020203	/* 2.2c */
+#define RTMP_LIB_VERSION	0x020204	/* 2.2d */
 
 #define RTMP_FEATURE_HTTP	0x01
 #define RTMP_FEATURE_ENC	0x02
-- 
2.40.0