Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
merge_av
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
胡斌
2017-11-29 23:31:04 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
fc098053d6f74df49e787d7bcf8b6c7a8217bb99
fc098053
1 parent
d191e6b8
fix warning
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
5 行增加
和
4 行删除
merge_av/merge_av.cpp
merge_av/merge_av.cpp
查看文件 @
fc09805
...
...
@@ -24,7 +24,7 @@ enum media_type{
};
vector
<
fileinfo
>
media_files
[
2
];
void
run_shell_cmd
(
char
*
cmd
)
void
run_shell_cmd
(
c
onst
c
har
*
cmd
)
{
if
(
only_print
){
printf
(
"
\n
%s"
,
cmd
);
...
...
@@ -34,8 +34,9 @@ void run_shell_cmd(char * cmd)
}
}
char
*
default_vcodec_param
=
" -vcodec libx264 -level 3.1 -preset veryfast -g 40 -r 20 "
;
char
*
default_acodec_param
=
" -acodec copy "
;
const
char
*
default_vcodec_param
=
" -vcodec libx264 -level 3.1 -preset veryfast -g 40 -r 20 "
;
const
char
*
default_acodec_param
=
" -acodec copy "
;
char
vcodec_param
[
1024
];
char
acodec_param
[
1024
];
...
...
@@ -224,7 +225,7 @@ int main(int argc, char * argv[])
if
(
argc
<
2
)
{
printf
(
" run ffmpeg to merge audio and video files according to the record info file,
\n
usage:"
);
printf
(
"
\n
%s record_info_filename [-p]"
,
argv
[
0
]);
printf
(
"
\n
-p :only print the command,don't run ffmpeg"
);
printf
(
"
\n
-p :only print the command,don't run ffmpeg
\n
"
);
return
-
1
;
}
...
...
请
注册
或
登录
后发表评论