From aad42d7941f9d14fcd4a37910ab65585dce02b9b Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 29 Jun 2014 00:09:55 +0800 Subject: [PATCH] fix ubuntu14 build warnings --- trunk/research/librtmp/srs_detect_rtmp.c | 2 +- trunk/research/librtmp/srs_flv_injecter.c | 2 +- trunk/research/librtmp/srs_flv_parser.c | 2 +- trunk/research/librtmp/srs_ingest_flv.c | 2 +- trunk/research/librtmp/srs_ingest_rtmp.c | 2 +- trunk/research/librtmp/srs_play.c | 2 +- trunk/src/app/srs_app_dvr.cpp | 4 ++++ trunk/src/app/srs_app_dvr.hpp | 2 ++ 8 files changed, 12 insertions(+), 6 deletions(-) diff --git a/trunk/research/librtmp/srs_detect_rtmp.c b/trunk/research/librtmp/srs_detect_rtmp.c index df592939d..0ebcb82d3 100644 --- a/trunk/research/librtmp/srs_detect_rtmp.c +++ b/trunk/research/librtmp/srs_detect_rtmp.c @@ -67,7 +67,7 @@ int main(int argc, char** argv) " timeout how long to timeout, in seconds, system time.\n" "For example:\n" " %s rtmp://127.0.0.1:1935/live/livestream 3 10\n", - argv[0]); + argv[0], argv[0]); ret = 1; exit(ret); return ret; diff --git a/trunk/research/librtmp/srs_flv_injecter.c b/trunk/research/librtmp/srs_flv_injecter.c index 3be014670..85a813647 100644 --- a/trunk/research/librtmp/srs_flv_injecter.c +++ b/trunk/research/librtmp/srs_flv_injecter.c @@ -60,7 +60,7 @@ int main(int argc, char** argv) " out_flv_file the inject output file, can be in_flv_file.\n" "For example:\n" " %s ../../doc/source.200kbps.768x320.flv injected.flv\n", - argv[0]); + argv[0], argv[0]); ret = 1; exit(ret); return ret; diff --git a/trunk/research/librtmp/srs_flv_parser.c b/trunk/research/librtmp/srs_flv_parser.c index 108a483ac..638257eb6 100644 --- a/trunk/research/librtmp/srs_flv_parser.c +++ b/trunk/research/librtmp/srs_flv_parser.c @@ -51,7 +51,7 @@ int main(int argc, char** argv) " in_flv_file flv file to parse and show.\n" "For example:\n" " %s ../../doc/source.200kbps.768x320.flv\n", - argv[0]); + argv[0], argv[0]); ret = 1; exit(ret); return ret; diff --git a/trunk/research/librtmp/srs_ingest_flv.c b/trunk/research/librtmp/srs_ingest_flv.c index 8c4c0a07e..04f588b34 100644 --- a/trunk/research/librtmp/srs_ingest_flv.c +++ b/trunk/research/librtmp/srs_ingest_flv.c @@ -67,7 +67,7 @@ int main(int argc, char** argv) " out_rtmp_url output rtmp url, publish to this url.\n" "For example:\n" " %s -i ../../doc/source.200kbps.768x320.flv -y rtmp://127.0.0.1/live/demo\n", - argv[0]); + argv[0], argv[0]); ret = 1; exit(ret); return ret; diff --git a/trunk/research/librtmp/srs_ingest_rtmp.c b/trunk/research/librtmp/srs_ingest_rtmp.c index 1adeb889f..28cbb4d33 100644 --- a/trunk/research/librtmp/srs_ingest_rtmp.c +++ b/trunk/research/librtmp/srs_ingest_rtmp.c @@ -53,7 +53,7 @@ int main(int argc, char** argv) " out_rtmp_url output rtmp url, publish to this url.\n" "For example:\n" " %s -i rtmp://127.0.0.1/live/livestream -y rtmp://127.0.0.1/live/demo\n", - argv[0]); + argv[0], argv[0]); ret = 1; exit(ret); return ret; diff --git a/trunk/research/librtmp/srs_play.c b/trunk/research/librtmp/srs_play.c index 644794477..e0710a433 100644 --- a/trunk/research/librtmp/srs_play.c +++ b/trunk/research/librtmp/srs_play.c @@ -44,7 +44,7 @@ int main(int argc, char** argv) " rtmp_url RTMP stream url to play\n" "For example:\n" " %s rtmp://127.0.0.1:1935/live/livestream\n", - argv[0]); + argv[0], argv[0]); int ret = 1; exit(ret); return ret; diff --git a/trunk/src/app/srs_app_dvr.cpp b/trunk/src/app/srs_app_dvr.cpp index 6ffb10f06..6993a0909 100644 --- a/trunk/src/app/srs_app_dvr.cpp +++ b/trunk/src/app/srs_app_dvr.cpp @@ -53,6 +53,10 @@ SrsFlvSegment::SrsFlvSegment() stream_duration = 0; } +SrsFlvSegment::~SrsFlvSegment() +{ +} + void SrsFlvSegment::reset() { has_keyframe = false; diff --git a/trunk/src/app/srs_app_dvr.hpp b/trunk/src/app/srs_app_dvr.hpp index 1a05fe9b2..b21d21b8f 100644 --- a/trunk/src/app/srs_app_dvr.hpp +++ b/trunk/src/app/srs_app_dvr.hpp @@ -86,6 +86,8 @@ public: int64_t stream_previous_pkt_time; public: SrsFlvSegment(); + virtual ~SrsFlvSegment(); +public: virtual void reset(); };