winlin

fix ubuntu14 build warnings

... ... @@ -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;
... ...
... ... @@ -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;
... ...
... ... @@ -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;
... ...
... ... @@ -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;
... ...
... ... @@ -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;
... ...
... ... @@ -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;
... ...
... ... @@ -53,6 +53,10 @@ SrsFlvSegment::SrsFlvSegment()
stream_duration = 0;
}
SrsFlvSegment::~SrsFlvSegment()
{
}
void SrsFlvSegment::reset()
{
has_keyframe = false;
... ...
... ... @@ -86,6 +86,8 @@ public:
int64_t stream_previous_pkt_time;
public:
SrsFlvSegment();
virtual ~SrsFlvSegment();
public:
virtual void reset();
};
... ...