Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
6a63ff19
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,发现更多精彩内容 >>
提交
6a63ff19
编写于
6月 24, 2009
作者:
B
Baptiste Coudurier
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
check stream existence before assignment, fix #1222
Originally committed as revision 19259 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
2722c3a3
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
107 addition
and
29 deletion
+107
-29
libavformat/mov.c
libavformat/mov.c
+107
-29
未找到文件。
libavformat/mov.c
浏览文件 @
6a63ff19
...
...
@@ -244,10 +244,15 @@ static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
static
int
mov_read_dref
(
MOVContext
*
c
,
ByteIOContext
*
pb
,
MOVAtom
atom
)
{
AVStream
*
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
]
;
MOVStreamContext
*
sc
=
st
->
priv_data
;
AVStream
*
st
;
MOVStreamContext
*
sc
;
int
entries
,
i
,
j
;
if
(
c
->
fc
->
nb_streams
<
1
)
return
0
;
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
sc
=
st
->
priv_data
;
get_be32
(
pb
);
// version + flags
entries
=
get_be32
(
pb
);
if
(
entries
>=
UINT_MAX
/
sizeof
(
*
sc
->
drefs
))
...
...
@@ -390,9 +395,13 @@ static const AVCodecTag mp4_audio_types[] = {
static
int
mov_read_esds
(
MOVContext
*
c
,
ByteIOContext
*
pb
,
MOVAtom
atom
)
{
AVStream
*
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
]
;
AVStream
*
st
;
int
tag
,
len
;
if
(
c
->
fc
->
nb_streams
<
1
)
return
0
;
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
get_be32
(
pb
);
/* version + flags */
len
=
mp4_read_descr
(
c
,
pb
,
&
tag
);
if
(
tag
==
MP4ESDescrTag
)
{
...
...
@@ -449,7 +458,12 @@ static int mov_read_pasp(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
{
const
int
num
=
get_be32
(
pb
);
const
int
den
=
get_be32
(
pb
);
AVStream
*
const
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
AVStream
*
st
;
if
(
c
->
fc
->
nb_streams
<
1
)
return
0
;
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
if
(
den
!=
0
)
{
if
((
st
->
sample_aspect_ratio
.
den
!=
1
||
st
->
sample_aspect_ratio
.
num
)
&&
// default
(
den
!=
st
->
sample_aspect_ratio
.
den
||
num
!=
st
->
sample_aspect_ratio
.
num
))
...
...
@@ -503,12 +517,18 @@ static int mov_read_moof(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
static
int
mov_read_mdhd
(
MOVContext
*
c
,
ByteIOContext
*
pb
,
MOVAtom
atom
)
{
AVStream
*
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
]
;
MOVStreamContext
*
sc
=
st
->
priv_data
;
int
version
=
get_byte
(
pb
)
;
AVStream
*
st
;
MOVStreamContext
*
sc
;
int
version
;
char
language
[
4
]
=
{
0
};
unsigned
lang
;
if
(
c
->
fc
->
nb_streams
<
1
)
return
0
;
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
sc
=
st
->
priv_data
;
version
=
get_byte
(
pb
);
if
(
version
>
1
)
return
-
1
;
/* unsupported */
...
...
@@ -570,7 +590,11 @@ static int mov_read_mvhd(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
static
int
mov_read_smi
(
MOVContext
*
c
,
ByteIOContext
*
pb
,
MOVAtom
atom
)
{
AVStream
*
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
AVStream
*
st
;
if
(
c
->
fc
->
nb_streams
<
1
)
return
0
;
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
if
((
uint64_t
)
atom
.
size
>
(
1
<<
30
))
return
-
1
;
...
...
@@ -590,9 +614,14 @@ static int mov_read_smi(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
static
int
mov_read_enda
(
MOVContext
*
c
,
ByteIOContext
*
pb
,
MOVAtom
atom
)
{
AVStream
*
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
int
little_endian
=
get_be16
(
pb
);
AVStream
*
st
;
int
little_endian
;
if
(
c
->
fc
->
nb_streams
<
1
)
return
0
;
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
little_endian
=
get_be16
(
pb
);
dprintf
(
c
->
fc
,
"enda %d
\n
"
,
little_endian
);
if
(
little_endian
==
1
)
{
switch
(
st
->
codec
->
codec_id
)
{
...
...
@@ -642,7 +671,11 @@ static int mov_read_extradata(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
static
int
mov_read_wave
(
MOVContext
*
c
,
ByteIOContext
*
pb
,
MOVAtom
atom
)
{
AVStream
*
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
AVStream
*
st
;
if
(
c
->
fc
->
nb_streams
<
1
)
return
0
;
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
if
((
uint64_t
)
atom
.
size
>
(
1
<<
30
))
return
-
1
;
...
...
@@ -669,7 +702,11 @@ static int mov_read_wave(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
*/
static
int
mov_read_glbl
(
MOVContext
*
c
,
ByteIOContext
*
pb
,
MOVAtom
atom
)
{
AVStream
*
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
AVStream
*
st
;
if
(
c
->
fc
->
nb_streams
<
1
)
return
0
;
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
if
((
uint64_t
)
atom
.
size
>
(
1
<<
30
))
return
-
1
;
...
...
@@ -685,10 +722,15 @@ static int mov_read_glbl(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
static
int
mov_read_stco
(
MOVContext
*
c
,
ByteIOContext
*
pb
,
MOVAtom
atom
)
{
AVStream
*
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
]
;
MOVStreamContext
*
sc
=
st
->
priv_data
;
AVStream
*
st
;
MOVStreamContext
*
sc
;
unsigned
int
i
,
entries
;
if
(
c
->
fc
->
nb_streams
<
1
)
return
0
;
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
sc
=
st
->
priv_data
;
get_byte
(
pb
);
/* version */
get_be24
(
pb
);
/* flags */
...
...
@@ -751,10 +793,15 @@ static enum CodecID mov_get_lpcm_codec_id(int bps, int flags)
static
int
mov_read_stsd
(
MOVContext
*
c
,
ByteIOContext
*
pb
,
MOVAtom
atom
)
{
AVStream
*
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
]
;
MOVStreamContext
*
sc
=
st
->
priv_data
;
AVStream
*
st
;
MOVStreamContext
*
sc
;
int
j
,
entries
,
pseudo_stream_id
;
if
(
c
->
fc
->
nb_streams
<
1
)
return
0
;
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
sc
=
st
->
priv_data
;
get_byte
(
pb
);
/* version */
get_be24
(
pb
);
/* flags */
...
...
@@ -1078,10 +1125,15 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
static
int
mov_read_stsc
(
MOVContext
*
c
,
ByteIOContext
*
pb
,
MOVAtom
atom
)
{
AVStream
*
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
]
;
MOVStreamContext
*
sc
=
st
->
priv_data
;
AVStream
*
st
;
MOVStreamContext
*
sc
;
unsigned
int
i
,
entries
;
if
(
c
->
fc
->
nb_streams
<
1
)
return
0
;
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
sc
=
st
->
priv_data
;
get_byte
(
pb
);
/* version */
get_be24
(
pb
);
/* flags */
...
...
@@ -1135,10 +1187,15 @@ static int mov_read_stps(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
static
int
mov_read_stss
(
MOVContext
*
c
,
ByteIOContext
*
pb
,
MOVAtom
atom
)
{
AVStream
*
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
]
;
MOVStreamContext
*
sc
=
st
->
priv_data
;
AVStream
*
st
;
MOVStreamContext
*
sc
;
unsigned
int
i
,
entries
;
if
(
c
->
fc
->
nb_streams
<
1
)
return
0
;
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
sc
=
st
->
priv_data
;
get_byte
(
pb
);
/* version */
get_be24
(
pb
);
/* flags */
...
...
@@ -1162,12 +1219,17 @@ static int mov_read_stss(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
static
int
mov_read_stsz
(
MOVContext
*
c
,
ByteIOContext
*
pb
,
MOVAtom
atom
)
{
AVStream
*
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
]
;
MOVStreamContext
*
sc
=
st
->
priv_data
;
AVStream
*
st
;
MOVStreamContext
*
sc
;
unsigned
int
i
,
entries
,
sample_size
,
field_size
,
num_bytes
;
GetBitContext
gb
;
unsigned
char
*
buf
;
if
(
c
->
fc
->
nb_streams
<
1
)
return
0
;
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
sc
=
st
->
priv_data
;
get_byte
(
pb
);
/* version */
get_be24
(
pb
);
/* flags */
...
...
@@ -1225,12 +1287,17 @@ static int mov_read_stsz(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
static
int
mov_read_stts
(
MOVContext
*
c
,
ByteIOContext
*
pb
,
MOVAtom
atom
)
{
AVStream
*
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
]
;
MOVStreamContext
*
sc
=
st
->
priv_data
;
AVStream
*
st
;
MOVStreamContext
*
sc
;
unsigned
int
i
,
entries
;
int64_t
duration
=
0
;
int64_t
total_sample_count
=
0
;
if
(
c
->
fc
->
nb_streams
<
1
)
return
0
;
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
sc
=
st
->
priv_data
;
get_byte
(
pb
);
/* version */
get_be24
(
pb
);
/* flags */
entries
=
get_be32
(
pb
);
...
...
@@ -1290,10 +1357,15 @@ static int mov_read_cslg(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
static
int
mov_read_ctts
(
MOVContext
*
c
,
ByteIOContext
*
pb
,
MOVAtom
atom
)
{
AVStream
*
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
]
;
MOVStreamContext
*
sc
=
st
->
priv_data
;
AVStream
*
st
;
MOVStreamContext
*
sc
;
unsigned
int
i
,
entries
;
if
(
c
->
fc
->
nb_streams
<
1
)
return
0
;
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
sc
=
st
->
priv_data
;
get_byte
(
pb
);
/* version */
get_be24
(
pb
);
/* flags */
entries
=
get_be32
(
pb
);
...
...
@@ -1547,10 +1619,16 @@ static int mov_read_tkhd(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
int
height
;
int64_t
disp_transform
[
2
];
int
display_matrix
[
3
][
2
];
AVStream
*
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
MOVStreamContext
*
sc
=
st
->
priv_data
;
int
version
=
get_byte
(
pb
);
AVStream
*
st
;
MOVStreamContext
*
sc
;
int
version
;
if
(
c
->
fc
->
nb_streams
<
1
)
return
0
;
st
=
c
->
fc
->
streams
[
c
->
fc
->
nb_streams
-
1
];
sc
=
st
->
priv_data
;
version
=
get_byte
(
pb
);
get_be24
(
pb
);
/* flags */
/*
MOV_TRACK_ENABLED 0x0001
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录