Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
1fa395e4
F
Ffmpeg
项目概览
小白菜888
/
Ffmpeg
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
Ffmpeg
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1fa395e4
编写于
10月 17, 2011
作者:
A
Anton Khirnov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lavf: use avpriv_ prefix for ff_new_chapter().
It's used in libavdevice.
上级
68d3aec8
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
11 addition
and
11 deletion
+11
-11
libavdevice/libcdio.c
libavdevice/libcdio.c
+1
-1
libavformat/asfdec.c
libavformat/asfdec.c
+1
-1
libavformat/ffmetadec.c
libavformat/ffmetadec.c
+1
-1
libavformat/internal.h
libavformat/internal.h
+2
-2
libavformat/matroskadec.c
libavformat/matroskadec.c
+1
-1
libavformat/mov.c
libavformat/mov.c
+2
-2
libavformat/nutdec.c
libavformat/nutdec.c
+1
-1
libavformat/oggparsevorbis.c
libavformat/oggparsevorbis.c
+1
-1
libavformat/utils.c
libavformat/utils.c
+1
-1
未找到文件。
libavdevice/libcdio.c
浏览文件 @
1fa395e4
...
...
@@ -97,7 +97,7 @@ static av_cold int read_header(AVFormatContext *ctx, AVFormatParameters *ap)
for
(
i
=
0
;
i
<
s
->
drive
->
tracks
;
i
++
)
{
char
title
[
16
];
snprintf
(
title
,
sizeof
(
title
),
"track %02d"
,
s
->
drive
->
disc_toc
[
i
].
bTrack
);
ff
_new_chapter
(
ctx
,
i
,
st
->
time_base
,
s
->
drive
->
disc_toc
[
i
].
dwStartSector
,
avpriv
_new_chapter
(
ctx
,
i
,
st
->
time_base
,
s
->
drive
->
disc_toc
[
i
].
dwStartSector
,
s
->
drive
->
disc_toc
[
i
+
1
].
dwStartSector
,
title
);
}
...
...
libavformat/asfdec.c
浏览文件 @
1fa395e4
...
...
@@ -573,7 +573,7 @@ static int asf_read_marker(AVFormatContext *s, int64_t size)
name_len
=
avio_rl32
(
pb
);
// name length
if
((
ret
=
avio_get_str16le
(
pb
,
name_len
*
2
,
name
,
sizeof
(
name
)))
<
name_len
)
avio_skip
(
pb
,
name_len
-
ret
);
ff
_new_chapter
(
s
,
i
,
(
AVRational
){
1
,
10000000
},
pres_time
,
AV_NOPTS_VALUE
,
name
);
avpriv
_new_chapter
(
s
,
i
,
(
AVRational
){
1
,
10000000
},
pres_time
,
AV_NOPTS_VALUE
,
name
);
}
return
0
;
...
...
libavformat/ffmetadec.c
浏览文件 @
1fa395e4
...
...
@@ -75,7 +75,7 @@ static AVChapter *read_chapter(AVFormatContext *s)
end
=
AV_NOPTS_VALUE
;
}
return
ff
_new_chapter
(
s
,
s
->
nb_chapters
,
tb
,
start
,
end
,
NULL
);
return
avpriv
_new_chapter
(
s
,
s
->
nb_chapters
,
tb
,
start
,
end
,
NULL
);
}
static
uint8_t
*
unescape
(
uint8_t
*
buf
,
int
size
)
...
...
libavformat/internal.h
浏览文件 @
1fa395e4
...
...
@@ -225,8 +225,8 @@ int ff_add_index_entry(AVIndexEntry **index_entries,
*
* @return AVChapter or NULL on error
*/
AVChapter
*
ff
_new_chapter
(
AVFormatContext
*
s
,
int
id
,
AVRational
time_base
,
int64_t
start
,
int64_t
end
,
const
char
*
title
);
AVChapter
*
avpriv
_new_chapter
(
AVFormatContext
*
s
,
int
id
,
AVRational
time_base
,
int64_t
start
,
int64_t
end
,
const
char
*
title
);
/**
* Ensure the index uses less memory than the maximum specified in
...
...
libavformat/matroskadec.c
浏览文件 @
1fa395e4
...
...
@@ -1599,7 +1599,7 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
if
(
chapters
[
i
].
start
!=
AV_NOPTS_VALUE
&&
chapters
[
i
].
uid
&&
(
max_start
==
0
||
chapters
[
i
].
start
>
max_start
))
{
chapters
[
i
].
chapter
=
ff
_new_chapter
(
s
,
chapters
[
i
].
uid
,
(
AVRational
){
1
,
1000000000
},
avpriv
_new_chapter
(
s
,
chapters
[
i
].
uid
,
(
AVRational
){
1
,
1000000000
},
chapters
[
i
].
start
,
chapters
[
i
].
end
,
chapters
[
i
].
title
);
av_dict_set
(
&
chapters
[
i
].
chapter
->
metadata
,
...
...
libavformat/mov.c
浏览文件 @
1fa395e4
...
...
@@ -287,7 +287,7 @@ static int mov_read_chpl(MOVContext *c, AVIOContext *pb, MOVAtom atom)
avio_read
(
pb
,
str
,
str_len
);
str
[
str_len
]
=
0
;
ff
_new_chapter
(
c
->
fc
,
i
,
(
AVRational
){
1
,
10000000
},
start
,
AV_NOPTS_VALUE
,
str
);
avpriv
_new_chapter
(
c
->
fc
,
i
,
(
AVRational
){
1
,
10000000
},
start
,
AV_NOPTS_VALUE
,
str
);
}
return
0
;
}
...
...
@@ -2420,7 +2420,7 @@ static void mov_read_chapters(AVFormatContext *s)
}
}
ff
_new_chapter
(
s
,
i
,
st
->
time_base
,
sample
->
timestamp
,
end
,
title
);
avpriv
_new_chapter
(
s
,
i
,
st
->
time_base
,
sample
->
timestamp
,
end
,
title
);
av_freep
(
&
title
);
}
finish:
...
...
libavformat/nutdec.c
浏览文件 @
1fa395e4
...
...
@@ -416,7 +416,7 @@ static int decode_info_header(NUTContext *nut){
if
(
chapter_id
&&
!
stream_id_plus1
){
int64_t
start
=
chapter_start
/
nut
->
time_base_count
;
chapter
=
ff
_new_chapter
(
s
,
chapter_id
,
chapter
=
avpriv
_new_chapter
(
s
,
chapter_id
,
nut
->
time_base
[
chapter_start
%
nut
->
time_base_count
],
start
,
start
+
chapter_len
,
NULL
);
metadata
=
&
chapter
->
metadata
;
...
...
libavformat/oggparsevorbis.c
浏览文件 @
1fa395e4
...
...
@@ -45,7 +45,7 @@ static int ogm_chapter(AVFormatContext *as, uint8_t *key, uint8_t *val)
if
(
sscanf
(
val
,
"%02d:%02d:%02d.%03d"
,
&
h
,
&
m
,
&
s
,
&
ms
)
<
4
)
return
0
;
ff
_new_chapter
(
as
,
cnum
,
(
AVRational
){
1
,
1000
},
avpriv
_new_chapter
(
as
,
cnum
,
(
AVRational
){
1
,
1000
},
ms
+
1000
*
(
s
+
60
*
(
m
+
60
*
h
)),
AV_NOPTS_VALUE
,
NULL
);
av_free
(
val
);
...
...
libavformat/utils.c
浏览文件 @
1fa395e4
...
...
@@ -2739,7 +2739,7 @@ AVProgram *av_new_program(AVFormatContext *ac, int id)
return
program
;
}
AVChapter
*
ff
_new_chapter
(
AVFormatContext
*
s
,
int
id
,
AVRational
time_base
,
int64_t
start
,
int64_t
end
,
const
char
*
title
)
AVChapter
*
avpriv
_new_chapter
(
AVFormatContext
*
s
,
int
id
,
AVRational
time_base
,
int64_t
start
,
int64_t
end
,
const
char
*
title
)
{
AVChapter
*
chapter
=
NULL
;
int
i
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录