正在显示
8 个修改的文件
包含
12 行增加
和
6 行删除
| @@ -67,7 +67,7 @@ int main(int argc, char** argv) | @@ -67,7 +67,7 @@ int main(int argc, char** argv) | ||
| 67 | " timeout how long to timeout, in seconds, system time.\n" | 67 | " timeout how long to timeout, in seconds, system time.\n" |
| 68 | "For example:\n" | 68 | "For example:\n" |
| 69 | " %s rtmp://127.0.0.1:1935/live/livestream 3 10\n", | 69 | " %s rtmp://127.0.0.1:1935/live/livestream 3 10\n", |
| 70 | - argv[0]); | 70 | + argv[0], argv[0]); |
| 71 | ret = 1; | 71 | ret = 1; |
| 72 | exit(ret); | 72 | exit(ret); |
| 73 | return ret; | 73 | return ret; |
| @@ -60,7 +60,7 @@ int main(int argc, char** argv) | @@ -60,7 +60,7 @@ int main(int argc, char** argv) | ||
| 60 | " out_flv_file the inject output file, can be in_flv_file.\n" | 60 | " out_flv_file the inject output file, can be in_flv_file.\n" |
| 61 | "For example:\n" | 61 | "For example:\n" |
| 62 | " %s ../../doc/source.200kbps.768x320.flv injected.flv\n", | 62 | " %s ../../doc/source.200kbps.768x320.flv injected.flv\n", |
| 63 | - argv[0]); | 63 | + argv[0], argv[0]); |
| 64 | ret = 1; | 64 | ret = 1; |
| 65 | exit(ret); | 65 | exit(ret); |
| 66 | return ret; | 66 | return ret; |
| @@ -51,7 +51,7 @@ int main(int argc, char** argv) | @@ -51,7 +51,7 @@ int main(int argc, char** argv) | ||
| 51 | " in_flv_file flv file to parse and show.\n" | 51 | " in_flv_file flv file to parse and show.\n" |
| 52 | "For example:\n" | 52 | "For example:\n" |
| 53 | " %s ../../doc/source.200kbps.768x320.flv\n", | 53 | " %s ../../doc/source.200kbps.768x320.flv\n", |
| 54 | - argv[0]); | 54 | + argv[0], argv[0]); |
| 55 | ret = 1; | 55 | ret = 1; |
| 56 | exit(ret); | 56 | exit(ret); |
| 57 | return ret; | 57 | return ret; |
| @@ -67,7 +67,7 @@ int main(int argc, char** argv) | @@ -67,7 +67,7 @@ int main(int argc, char** argv) | ||
| 67 | " out_rtmp_url output rtmp url, publish to this url.\n" | 67 | " out_rtmp_url output rtmp url, publish to this url.\n" |
| 68 | "For example:\n" | 68 | "For example:\n" |
| 69 | " %s -i ../../doc/source.200kbps.768x320.flv -y rtmp://127.0.0.1/live/demo\n", | 69 | " %s -i ../../doc/source.200kbps.768x320.flv -y rtmp://127.0.0.1/live/demo\n", |
| 70 | - argv[0]); | 70 | + argv[0], argv[0]); |
| 71 | ret = 1; | 71 | ret = 1; |
| 72 | exit(ret); | 72 | exit(ret); |
| 73 | return ret; | 73 | return ret; |
| @@ -53,7 +53,7 @@ int main(int argc, char** argv) | @@ -53,7 +53,7 @@ int main(int argc, char** argv) | ||
| 53 | " out_rtmp_url output rtmp url, publish to this url.\n" | 53 | " out_rtmp_url output rtmp url, publish to this url.\n" |
| 54 | "For example:\n" | 54 | "For example:\n" |
| 55 | " %s -i rtmp://127.0.0.1/live/livestream -y rtmp://127.0.0.1/live/demo\n", | 55 | " %s -i rtmp://127.0.0.1/live/livestream -y rtmp://127.0.0.1/live/demo\n", |
| 56 | - argv[0]); | 56 | + argv[0], argv[0]); |
| 57 | ret = 1; | 57 | ret = 1; |
| 58 | exit(ret); | 58 | exit(ret); |
| 59 | return ret; | 59 | return ret; |
| @@ -44,7 +44,7 @@ int main(int argc, char** argv) | @@ -44,7 +44,7 @@ int main(int argc, char** argv) | ||
| 44 | " rtmp_url RTMP stream url to play\n" | 44 | " rtmp_url RTMP stream url to play\n" |
| 45 | "For example:\n" | 45 | "For example:\n" |
| 46 | " %s rtmp://127.0.0.1:1935/live/livestream\n", | 46 | " %s rtmp://127.0.0.1:1935/live/livestream\n", |
| 47 | - argv[0]); | 47 | + argv[0], argv[0]); |
| 48 | int ret = 1; | 48 | int ret = 1; |
| 49 | exit(ret); | 49 | exit(ret); |
| 50 | return ret; | 50 | return ret; |
| @@ -53,6 +53,10 @@ SrsFlvSegment::SrsFlvSegment() | @@ -53,6 +53,10 @@ SrsFlvSegment::SrsFlvSegment() | ||
| 53 | stream_duration = 0; | 53 | stream_duration = 0; |
| 54 | } | 54 | } |
| 55 | 55 | ||
| 56 | +SrsFlvSegment::~SrsFlvSegment() | ||
| 57 | +{ | ||
| 58 | +} | ||
| 59 | + | ||
| 56 | void SrsFlvSegment::reset() | 60 | void SrsFlvSegment::reset() |
| 57 | { | 61 | { |
| 58 | has_keyframe = false; | 62 | has_keyframe = false; |
-
请 注册 或 登录 后发表评论