Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
1ce50d32
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,发现更多精彩内容 >>
提交
1ce50d32
编写于
3月 28, 2008
作者:
M
Michael Niedermayer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
indent
Originally committed as revision 12618 to
svn://svn.ffmpeg.org/ffmpeg/trunk
上级
9bcc2883
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
41 addition
and
43 deletion
+41
-43
libavformat/avidec.c
libavformat/avidec.c
+41
-43
未找到文件。
libavformat/avidec.c
浏览文件 @
1ce50d32
...
...
@@ -777,41 +777,40 @@ resync:
//parse ##dc/##wb
if
(
n
<
s
->
nb_streams
){
AVStream
*
st
;
AVIStream
*
ast
;
st
=
s
->
streams
[
n
];
ast
=
st
->
priv_data
;
AVStream
*
st
;
AVIStream
*
ast
;
st
=
s
->
streams
[
n
];
ast
=
st
->
priv_data
;
if
(
s
->
nb_streams
>=
2
){
AVStream
*
st1
=
s
->
streams
[
1
];
AVIStream
*
ast1
=
st1
->
priv_data
;
//workaround for broken small-file-bug402.avi
if
(
d
[
2
]
==
'w'
&&
d
[
3
]
==
'b'
&&
n
==
0
&&
st
->
codec
->
codec_type
==
CODEC_TYPE_VIDEO
&&
st1
->
codec
->
codec_type
==
CODEC_TYPE_AUDIO
&&
ast
->
prefix
==
'd'
*
256
+
'c'
&&
(
d
[
2
]
*
256
+
d
[
3
]
==
ast1
->
prefix
||
!
ast1
->
prefix_count
)
){
n
=
1
;
st
=
st1
;
ast
=
ast1
;
av_log
(
s
,
AV_LOG_WARNING
,
"Invalid stream+prefix combination, assuming audio
\n
"
);
}
//workaround for broken small-file-bug402.avi
if
(
d
[
2
]
==
'w'
&&
d
[
3
]
==
'b'
&&
n
==
0
&&
st
->
codec
->
codec_type
==
CODEC_TYPE_VIDEO
&&
st1
->
codec
->
codec_type
==
CODEC_TYPE_AUDIO
&&
ast
->
prefix
==
'd'
*
256
+
'c'
&&
(
d
[
2
]
*
256
+
d
[
3
]
==
ast1
->
prefix
||
!
ast1
->
prefix_count
)
){
n
=
1
;
st
=
st1
;
ast
=
ast1
;
av_log
(
s
,
AV_LOG_WARNING
,
"Invalid stream+prefix combination, assuming audio
\n
"
);
}
}
if
(
(
st
->
discard
>=
AVDISCARD_DEFAULT
&&
size
==
0
)
/*|| (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & PKT_FLAG_KEY))*/
//FIXME needs a little reordering
||
st
->
discard
>=
AVDISCARD_ALL
){
if
(
(
st
->
discard
>=
AVDISCARD_DEFAULT
&&
size
==
0
)
/*|| (st->discard >= AVDISCARD_NONKEY && !(pkt->flags & PKT_FLAG_KEY))*/
//FIXME needs a little reordering
||
st
->
discard
>=
AVDISCARD_ALL
){
if
(
ast
->
sample_size
)
ast
->
frame_offset
+=
pkt
->
size
;
else
ast
->
frame_offset
++
;
url_fskip
(
pb
,
size
);
goto
resync
;
}
}
if
(
d
[
2
]
==
'p'
&&
d
[
3
]
==
'c'
&&
size
<=
4
*
256
+
4
)
{
if
(
d
[
2
]
==
'p'
&&
d
[
3
]
==
'c'
&&
size
<=
4
*
256
+
4
)
{
int
k
=
get_byte
(
pb
);
int
last
=
(
k
+
get_byte
(
pb
)
-
1
)
&
0xFF
;
...
...
@@ -821,32 +820,31 @@ resync:
ast
->
pal
[
k
]
=
get_be32
(
pb
)
>>
8
;
// b + (g << 8) + (r << 16);
ast
->
has_pal
=
1
;
goto
resync
;
}
else
if
(
((
ast
->
prefix_count
<
5
||
sync
+
9
>
i
)
&&
d
[
2
]
<
128
&&
d
[
3
]
<
128
)
||
d
[
2
]
*
256
+
d
[
3
]
==
ast
->
prefix
/*||
(d[2] == 'd' && d[3] == 'c') ||
(d[2] == 'w' && d[3] == 'b')*/
)
{
}
else
if
(
((
ast
->
prefix_count
<
5
||
sync
+
9
>
i
)
&&
d
[
2
]
<
128
&&
d
[
3
]
<
128
)
||
d
[
2
]
*
256
+
d
[
3
]
==
ast
->
prefix
/*||
(d[2] == 'd' && d[3] == 'c') ||
(d[2] == 'w' && d[3] == 'b')*/
)
{
//av_log(NULL, AV_LOG_DEBUG, "OK\n");
if
(
d
[
2
]
*
256
+
d
[
3
]
==
ast
->
prefix
)
ast
->
prefix_count
++
;
else
{
ast
->
prefix
=
d
[
2
]
*
256
+
d
[
3
];
ast
->
prefix_count
=
0
;
}
if
(
d
[
2
]
*
256
+
d
[
3
]
==
ast
->
prefix
)
ast
->
prefix_count
++
;
else
{
ast
->
prefix
=
d
[
2
]
*
256
+
d
[
3
];
ast
->
prefix_count
=
0
;
}
avi
->
stream_index
=
n
;
ast
->
packet_size
=
size
+
8
;
ast
->
remaining
=
size
;
avi
->
stream_index
=
n
;
ast
->
packet_size
=
size
+
8
;
ast
->
remaining
=
size
;
{
uint64_t
pos
=
url_ftell
(
pb
)
-
8
;
if
(
!
st
->
index_entries
||
!
st
->
nb_index_entries
||
st
->
index_entries
[
st
->
nb_index_entries
-
1
].
pos
<
pos
){
av_add_index_entry
(
st
,
pos
,
ast
->
frame_offset
/
FFMAX
(
1
,
ast
->
sample_size
),
size
,
0
,
AVINDEX_KEYFRAME
);
{
uint64_t
pos
=
url_ftell
(
pb
)
-
8
;
if
(
!
st
->
index_entries
||
!
st
->
nb_index_entries
||
st
->
index_entries
[
st
->
nb_index_entries
-
1
].
pos
<
pos
){
av_add_index_entry
(
st
,
pos
,
ast
->
frame_offset
/
FFMAX
(
1
,
ast
->
sample_size
),
size
,
0
,
AVINDEX_KEYFRAME
);
}
}
goto
resync
;
}
goto
resync
;
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录