[rtmpdump] r430 - in trunk: ChangeLog Makefile README librtmp/Makefile librtmp/handshake.h librtmp/rtmp.h

[hyc]

Author: hyc
Date: Wed Apr 14 21:38:11 2010
New Revision: 430

Log:
v2.2c stuff. not much user-visible

Modified:
   trunk/ChangeLog
   trunk/Makefile
   trunk/README
   trunk/librtmp/Makefile
   trunk/librtmp/handshake.h
   trunk/librtmp/rtmp.h

Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	Wed Apr 14 20:58:14 2010	(r429)
+++ trunk/ChangeLog	Wed Apr 14 21:38:11 2010	(r430)
@@ -4,6 +4,11 @@ Copyright 2009-2010 Howard Chu
 Copyright 2009 The Flvstreamer Team
 http://rtmpdump.mplayerhq.hu/
 
+14 April 2010, v2.2c
+- internal restructuring, fix #undef CRYPTO builds
+- add RTMP_SetupURL, RTMP_SetOpt APIs
+- add logging callback
+
 22 March 2010, v2.2b
 - fix v2.2a crashes in rtmpsrv/rtmpsuck
 - fix v2.2a .swfinfo location on Windows

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Wed Apr 14 20:58:14 2010	(r429)
+++ trunk/Makefile	Wed Apr 14 21:38:11 2010	(r430)
@@ -1,4 +1,4 @@
-VERSION=v2.2b
+VERSION=v2.2c
 
 CC=$(CROSS_COMPILE)gcc
 LD=$(CROSS_COMPILE)ld

Modified: trunk/README
==============================================================================
--- trunk/README	Wed Apr 14 20:58:14 2010	(r429)
+++ trunk/README	Wed Apr 14 21:38:11 2010	(r430)
@@ -1,4 +1,4 @@
-RTMP Dump v2.2b
+RTMP Dump v2.2c
 (C) 2009 Andrej Stepanchuk
 (C) 2009-2010 Howard Chu
 (C) 2010 2a665470ced7adb7156fcef47f8199a6371c117b8a79e399a2771e0b36384090

Modified: trunk/librtmp/Makefile
==============================================================================
--- trunk/librtmp/Makefile	Wed Apr 14 20:58:14 2010	(r429)
+++ trunk/librtmp/Makefile	Wed Apr 14 21:38:11 2010	(r430)
@@ -1,4 +1,4 @@
-VERSION=v2.2b
+VERSION=v2.2c
 
 prefix=/usr/local
 

Modified: trunk/librtmp/handshake.h
==============================================================================
--- trunk/librtmp/handshake.h	Wed Apr 14 20:58:14 2010	(r429)
+++ trunk/librtmp/handshake.h	Wed Apr 14 21:38:11 2010	(r430)
@@ -43,9 +43,9 @@ typedef gcry_cipher_hd_t	RC4_handle;
 #include <openssl/sha.h>
 #include <openssl/hmac.h>
 #include <openssl/rc4.h>
-#define HMAC_setup(ctx, key, len)	HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, (uint8_t *)key, len, EVP_sha256(), 0)
-#define HMAC_crunch(ctx, buf, len)	HMAC_Update(&ctx, (uint8_t *)buf, len)
-#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(&ctx, (uint8_t *)dig, &dlen); HMAC_CTX_cleanup(&ctx)
+#define HMAC_setup(ctx, key, len)	HMAC_CTX_init(&ctx); HMAC_Init_ex(&ctx, key, len, EVP_sha256(), 0)
+#define HMAC_crunch(ctx, buf, len)	HMAC_Update(&ctx, buf, len)
+#define HMAC_finish(ctx, dig, dlen)	HMAC_Final(&ctx, dig, &dlen); HMAC_CTX_cleanup(&ctx)
 
 typedef RC4_KEY *	RC4_handle;
 #define RC4_setup(h)	*h = malloc(sizeof(RC4_KEY))

Modified: trunk/librtmp/rtmp.h
==============================================================================
--- trunk/librtmp/rtmp.h	Wed Apr 14 20:58:14 2010	(r429)
+++ trunk/librtmp/rtmp.h	Wed Apr 14 21:38:11 2010	(r430)
@@ -39,7 +39,7 @@ extern "C"
 {
 #endif
 
-#define RTMP_LIB_VERSION	0x020202	/* 2.2b */
+#define RTMP_LIB_VERSION	0x020203	/* 2.2c */
 
 #define RTMP_FEATURE_HTTP	0x01
 #define RTMP_FEATURE_ENC	0x02