diff --git a/trunk/research/librtmp/srs_rtmp_dump.c b/trunk/research/librtmp/srs_rtmp_dump.c index 0d7aa6e25..ea8c8f24f 100644 --- a/trunk/research/librtmp/srs_rtmp_dump.c +++ b/trunk/research/librtmp/srs_rtmp_dump.c @@ -80,6 +80,9 @@ void parse_amf0_object(char* p, srs_amf0_t args) int main(int argc, char** argv) { + srs_flv_t flv = NULL; + srs_rtmp_t rtmp = NULL; + printf("dump rtmp stream to flv file\n"); printf("srs(simple-rtmp-server) client librtmp library.\n"); printf("version: %d.%d.%d\n", srs_version_major(), srs_version_minor(), srs_version_revision()); @@ -184,7 +187,7 @@ int main(int argc, char** argv) srs_human_trace("output to console"); } - srs_rtmp_t rtmp = srs_rtmp_create(rtmp_url); + rtmp = srs_rtmp_create(rtmp_url); if (__srs_rtmp_dns_resolve(rtmp) != 0) { srs_human_trace("dns resolve failed."); @@ -227,7 +230,6 @@ int main(int argc, char** argv) } srs_human_trace("play stream success"); - srs_flv_t flv = NULL; if (output_flv) { flv = srs_flv_open_write(output_flv); } @@ -282,9 +284,7 @@ int main(int argc, char** argv) rtmp_destroy: srs_rtmp_destroy(rtmp); - if (flv) { - srs_flv_close(flv); - } + srs_flv_close(flv); srs_human_trace("completed"); return 0; diff --git a/trunk/src/libs/srs_librtmp.cpp b/trunk/src/libs/srs_librtmp.cpp index 296a8588a..ccf1918f2 100644 --- a/trunk/src/libs/srs_librtmp.cpp +++ b/trunk/src/libs/srs_librtmp.cpp @@ -602,6 +602,11 @@ int __srs_rtmp_connect_server(srs_rtmp_t rtmp) int __srs_rtmp_do_complex_handshake(srs_rtmp_t rtmp) { +#ifndef SRS_AUTO_SSL + // complex handshake requires ssl + return ERROR_RTMP_HS_SSL_REQUIRE; +#endif + int ret = ERROR_SUCCESS; srs_assert(rtmp != NULL);