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-04-17 19:25:03 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
d287ed72b05566d15b6542d6e5ea7084a482cee2
d287ed72
1 parent
66df1f18
fix compile error in linux
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
10 行增加
和
2 行删除
merge_av/merge_av.cpp
pip/merge_pip.cpp
merge_av/merge_av.cpp
查看文件 @
d287ed7
...
...
@@ -340,12 +340,16 @@ float get_mp4_duration(const char *mediafile, bool bVideo)
return
parse_ffmpeg_duration
(
buf
);
}
#ifdef WIN32
#define strcasecmp _stricmp
#endif
float
get_file_duration
(
const
char
*
mediafile
,
bool
bVideo
)
{
char
buf
[
2048
];
int
len
=
strlen
(
mediafile
);
if
(
len
>
3
)
{
if
(
!
_stri
cmp
(
mediafile
+
len
-
4
,
".mp4"
))
{
if
(
!
strcase
cmp
(
mediafile
+
len
-
4
,
".mp4"
))
{
return
get_mp4_duration
(
mediafile
,
bVideo
);
}
}
...
...
pip/merge_pip.cpp
查看文件 @
d287ed7
...
...
@@ -384,12 +384,16 @@ float get_mp4_duration(const char *mediafile, bool bVideo)
return
parse_ffmpeg_duration
(
buf
);
}
#ifdef WIN32
#define strcasecmp _stricmp
#endif
float
get_file_duration
(
const
char
*
mediafile
,
bool
bVideo
)
{
char
buf
[
2048
];
int
len
=
strlen
(
mediafile
);
if
(
len
>
3
)
{
if
(
!
_stri
cmp
(
mediafile
+
len
-
4
,
".mp4"
))
{
if
(
!
strcase
cmp
(
mediafile
+
len
-
4
,
".mp4"
))
{
return
get_mp4_duration
(
mediafile
,
bVideo
);
}
}
...
...
请
注册
或
登录
后发表评论