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-30 08:14:57 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
71d136a8d13908d555aab064683c044bad6ce6db
71d136a8
1 parent
90883d03
fix bug in linux for loading codec param from cfg file
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
3 行增加
和
2 行删除
merge_av/merge_av.cpp
merge_av/merge_av.cpp
查看文件 @
71d136a
...
...
@@ -28,7 +28,7 @@ vector<fileinfo> media_files[2];
void
run_shell_cmd
(
const
char
*
cmd
)
{
if
(
only_print
){
printf
(
"
\n
%s
"
,
cmd
);
printf
(
"
%s
\n
"
,
cmd
);
}
else
{
system
(
cmd
);
...
...
@@ -247,7 +247,8 @@ void load_codec_param()
GetExePath
();
strcpy
(
cfgfile
,
exe_path
);
#else
strcpy
(
cfgfile
,
"~/"
;
strcpy
(
cfgfile
,
getenv
(
"HOME"
));
strcat
(
cfgfile
,
"/"
);
#endif
strcat
(
cfgfile
,
"merge_av.cfg"
);
ifstream
fin
(
cfgfile
);
...
...
请
注册
或
登录
后发表评论