v2.2c stuff. not much user-visible

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

diff --git a/ChangeLog b/ChangeLog
index 9f496974191b57698f170a6ea85b627b76e58a49..84269a6f2f16d982130655050d8ddf89bbee83be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/Makefile b/Makefile
index 637fc447ee6fb3bb4deea08f1b55ee0e6504f4ba..907b5669ba0150a1e0a17463bc65386c93d66384 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=v2.2b
+VERSION=v2.2c
 
 CC=$(CROSS_COMPILE)gcc
 LD=$(CROSS_COMPILE)ld

diff --git a/README b/README
index a98259bf0092589982a42d97fae209cec2ea9c19..194eeb7c78ab0fbd66917ed88bc37ee904a2f2c4 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-RTMP Dump v2.2b
+RTMP Dump v2.2c
 (C) 2009 Andrej Stepanchuk
 (C) 2009-2010 Howard Chu
 (C) 2010 2a665470ced7adb7156fcef47f8199a6371c117b8a79e399a2771e0b36384090

diff --git a/librtmp/Makefile b/librtmp/Makefile
index 776b340da491f8bf0560c7d63d72ae8f685cc105..c1ca973a462c610baa435d300ca503effe29aee4 100644 (file)
--- a/librtmp/Makefile
+++ b/librtmp/Makefile
@@ -1,4 +1,4 @@
-VERSION=v2.2b
+VERSION=v2.2c
 
 prefix=/usr/local
 

diff --git a/librtmp/handshake.h b/librtmp/handshake.h
index b0e88067f9dcb3347daed8c81432e376109cf4c1..f91f6897b9d444b8f5e46ac1754a22c249db7f6d 100644 (file)
--- a/librtmp/handshake.h
+++ b/librtmp/handshake.h
@@ -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))

diff --git a/librtmp/rtmp.h b/librtmp/rtmp.h
index 7376af255789b555c4d15816614fe06fedcac48f..d75c48f6936f22970a6fd952151b41dc0e1f7fa5 100644 (file)
--- a/librtmp/rtmp.h
+++ b/librtmp/rtmp.h
@@ -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