正在显示
1 个修改的文件
包含
5 行增加
和
4 行删除
| @@ -24,7 +24,7 @@ enum media_type{ | @@ -24,7 +24,7 @@ enum media_type{ | ||
| 24 | }; | 24 | }; |
| 25 | vector<fileinfo> media_files[2]; | 25 | vector<fileinfo> media_files[2]; |
| 26 | 26 | ||
| 27 | -void run_shell_cmd(char * cmd) | 27 | +void run_shell_cmd(const char * cmd) |
| 28 | { | 28 | { |
| 29 | if (only_print){ | 29 | if (only_print){ |
| 30 | printf("\n%s", cmd); | 30 | printf("\n%s", cmd); |
| @@ -34,8 +34,9 @@ void run_shell_cmd(char * cmd) | @@ -34,8 +34,9 @@ void run_shell_cmd(char * cmd) | ||
| 34 | } | 34 | } |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | -char * default_vcodec_param = " -vcodec libx264 -level 3.1 -preset veryfast -g 40 -r 20 "; | ||
| 38 | -char * default_acodec_param = " -acodec copy "; | 37 | +const char * default_vcodec_param = " -vcodec libx264 -level 3.1 -preset veryfast -g 40 -r 20 "; |
| 38 | +const char * default_acodec_param = " -acodec copy "; | ||
| 39 | + | ||
| 39 | char vcodec_param[1024]; | 40 | char vcodec_param[1024]; |
| 40 | char acodec_param[1024]; | 41 | char acodec_param[1024]; |
| 41 | 42 | ||
| @@ -224,7 +225,7 @@ int main(int argc, char * argv[]) | @@ -224,7 +225,7 @@ int main(int argc, char * argv[]) | ||
| 224 | if (argc < 2) { | 225 | if (argc < 2) { |
| 225 | printf(" run ffmpeg to merge audio and video files according to the record info file,\nusage:"); | 226 | printf(" run ffmpeg to merge audio and video files according to the record info file,\nusage:"); |
| 226 | printf("\n %s record_info_filename [-p]", argv[0]); | 227 | printf("\n %s record_info_filename [-p]", argv[0]); |
| 227 | - printf("\n -p :only print the command,don't run ffmpeg"); | 228 | + printf("\n -p :only print the command,don't run ffmpeg\n"); |
| 228 | return -1; | 229 | return -1; |
| 229 | } | 230 | } |
| 230 | 231 |
-
请 注册 或 登录 后发表评论