This file is part of MXE. See index.html for further information. From 272a91d06d71c2a326996f62797ed9ab42f69859 Mon Sep 17 00:00:00 2001 From: hyc Date: Wed, 30 Jun 2010 22:34:59 +0000 Subject: [PATCH 01/34] zlib dependency is only when CRYPTO is enabled git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@536 400ebc74-4327-4243-bc38-086b20814532 diff --git a/Makefile b/Makefile index 7470eb4..c7767b4 100644 --- a/Makefile +++ b/Makefile @@ -11,9 +11,10 @@ SYS=posix CRYPTO=OPENSSL #CRYPTO=POLARSSL #CRYPTO=GNUTLS -LIB_GNUTLS=-lgnutls -lgcrypt -LIB_OPENSSL=-lssl -lcrypto -LIB_POLARSSL=-lpolarssl +LIBZ=-lz +LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) +LIB_OPENSSL=-lssl -lcrypto$ (LIBZ) +LIB_POLARSSL=-lpolarssl $(LIBZ) CRYPTO_LIB=$(LIB_$(CRYPTO)) DEF_=-DNO_CRYPTO CRYPTO_DEF=$(DEF_$(CRYPTO)) @@ -33,7 +34,7 @@ MANDIR=$(DESTDIR)$(mandir) LIBS_posix= LIBS_mingw=-lws2_32 -lwinmm -lgdi32 -LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS) +LIBS=$(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS) THREADLIB_posix=-lpthread THREADLIB_mingw= diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c index 06d2bbb..277f21c 100644 --- a/librtmp/hashswf.c +++ b/librtmp/hashswf.c @@ -66,10 +66,10 @@ extern void RTMP_TLS_Init(); extern TLS_CTX RTMP_TLS_ctx; -#endif /* CRYPTO */ - #include +#endif /* CRYPTO */ + #define AGENT "Mozilla/5.0" HTTPResult -- 1.7.10.4 From 6556b9f9328acb1199dc1cc3f22fa82c86b51c8a Mon Sep 17 00:00:00 2001 From: hyc Date: Thu, 1 Jul 2010 12:00:43 +0000 Subject: [PATCH 02/34] Fix typo git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@537 400ebc74-4327-4243-bc38-086b20814532 diff --git a/Makefile b/Makefile index c7767b4..1fcdd78 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ CRYPTO=OPENSSL #CRYPTO=GNUTLS LIBZ=-lz LIB_GNUTLS=-lgnutls -lgcrypt $(LIBZ) -LIB_OPENSSL=-lssl -lcrypto$ (LIBZ) +LIB_OPENSSL=-lssl -lcrypto $(LIBZ) LIB_POLARSSL=-lpolarssl $(LIBZ) CRYPTO_LIB=$(LIB_$(CRYPTO)) DEF_=-DNO_CRYPTO -- 1.7.10.4 From 8a5901c8a74280c898deb4ebf1a2f5d6f68bce42 Mon Sep 17 00:00:00 2001 From: hyc Date: Sat, 3 Jul 2010 10:25:48 +0000 Subject: [PATCH 03/34] Document the escape coding used for special characters in values git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@538 400ebc74-4327-4243-bc38-086b20814532 diff --git a/librtmp/librtmp.3 b/librtmp/librtmp.3 index 055b52b..a5a7558 100644 --- a/librtmp/librtmp.3 +++ b/librtmp/librtmp.3 @@ -57,14 +57,19 @@ The session handle is freed using .BR RTMP_Free (). All data is transferred using FLV format. The basic session requires -an RTMP URL. Additional options may be specified by appending -space-separated key=value pairs to the URL. The RTMP URL format -is of the form +an RTMP URL. The RTMP URL format is of the form .nf rtmp[t][e|s]://hostname[:port][/app[/playpath]] .fi Plain rtmp, as well as tunneled and encrypted sessions are supported. + +Additional options may be specified by appending space-separated +key=value pairs to the URL. Special characters in values may need +to be escaped to prevent misinterpretation by the option parser. +The escape encoding uses a backslash followed by two hexadecimal digits +representing the ASCII value of the character. E.g., spaces must +be escaped as \fB\\20\fP and backslashes must be escaped as \fB\\5c\fP. .SH OPTIONS .SS "Network Parameters" These options define how to connect to the media server. -- 1.7.10.4 From c41568f57bec297581e8508a7e6a3d1e470dc81d Mon Sep 17 00:00:00 2001 From: hyc Date: Sat, 3 Jul 2010 10:28:57 +0000 Subject: [PATCH 04/34] Update from prev commit git-svn-id: svn://svn.mplayerhq.hu/rtmpdump/trunk@539 400ebc74-4327-4243-bc38-086b20814532 diff --git a/librtmp/librtmp.3 b/librtmp/librtmp.3 index a5a7558..66197d5 100644 --- a/librtmp/librtmp.3 +++ b/librtmp/librtmp.3 @@ -1,4 +1,4 @@ -.TH LIBRTMP 3 "2010-05-29" "RTMPDump v2.2e" +.TH LIBRTMP 3 "2010-07-03" "RTMPDump v2.3" .\" Copyright 2010 Howard Chu. .\" Copying permitted according to the GNU General Public License V2. .SH NAME diff --git a/librtmp/librtmp.3.html b/librtmp/librtmp.3.html index daf636f..e5e6f4b 100644 --- a/librtmp/librtmp.3.html +++ b/librtmp/librtmp.3.html @@ -6,7 +6,7 @@ LIBRTMP(3)LIBRTMP(3) -RTMPDump v2.2e2010-05-29LIBRTMP(3) +RTMPDump v2.32010-07-03LIBRTMP(3)