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
胡斌
2018-12-15 17:33:57 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
7cc4ca0d4c8be3d0890d3b03bda782b228a74500
7cc4ca0d
1 parent
77c0fe93
improve print info
print and return error if no paramter after "-t"
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
4 行增加
和
3 行删除
pip/VideoDecoder.cpp
pip/merge_pip.cpp
pip/VideoDecoder.cpp
查看文件 @
7cc4ca0
...
...
@@ -25,10 +25,10 @@ int CVideoDecoder::add(media_info &info)
if
(
_info
.
size
()
>
1
)
{
if
(
_is_finished
==
false
)
{
printf
(
"add file:%s ,but the last file, %s, is not finished?"
,
info
.
name
.
c_str
(),
_info
[
_info
.
size
()
-
2
].
name
.
c_str
());
printf
(
"
\n
add file:%s ,but the last file, %s, is not finished?"
,
info
.
name
.
c_str
(),
_info
[
_info
.
size
()
-
2
].
name
.
c_str
());
}
else
{
printf
(
"add file:%s ,after the last file, %s"
,
info
.
name
.
c_str
(),
_info
[
_info
.
size
()
-
2
].
name
.
c_str
());
printf
(
"
\n
add file:%s ,after the last file, %s"
,
info
.
name
.
c_str
(),
_info
[
_info
.
size
()
-
2
].
name
.
c_str
());
}
}
...
...
pip/merge_pip.cpp
查看文件 @
7cc4ca0
...
...
@@ -1086,8 +1086,9 @@ int main(int argc, char * argv[])
for
(
int
i
=
2
;
i
<
argc
;
i
++
){
if
(
!
strcmp
(
argv
[
i
],
"-t"
)){
i
++
;
if
(
i
<
argc
)
{
if
(
i
>
argc
)
{
printf
(
"error,should be 0,1 or 2 after -t"
);
return
-
2
;
}
piptype
=
atoi
(
argv
[
i
]);
}
...
...
请
注册
或
登录
后发表评论