Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
9d77a8fa
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,发现更多精彩内容 >>
提交
9d77a8fa
编写于
11月 06, 2011
作者:
M
Martin Storsjö
提交者:
Anton Khirnov
11月 13, 2011
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avformat: Use avio_open2, pass the AVFormatContext interrupt_callback onwards
Signed-off-by:
N
Anton Khirnov
<
anton@khirnov.net
>
上级
1dee0aca
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
14 addition
and
8 deletion
+14
-8
libavformat/applehttp.c
libavformat/applehttp.c
+2
-1
libavformat/applehttpproto.c
libavformat/applehttpproto.c
+2
-1
libavformat/img2.c
libavformat/img2.c
+4
-2
libavformat/mov.c
libavformat/mov.c
+4
-3
libavformat/utils.c
libavformat/utils.c
+2
-1
未找到文件。
libavformat/applehttp.c
浏览文件 @
9d77a8fa
...
...
@@ -210,7 +210,8 @@ static int parse_playlist(AppleHTTPContext *c, const char *url,
if
(
!
in
)
{
close_in
=
1
;
if
((
ret
=
avio_open
(
&
in
,
url
,
AVIO_FLAG_READ
))
<
0
)
if
((
ret
=
avio_open2
(
&
in
,
url
,
AVIO_FLAG_READ
,
c
->
interrupt_callback
,
NULL
))
<
0
)
return
ret
;
}
...
...
libavformat/applehttpproto.c
浏览文件 @
9d77a8fa
...
...
@@ -114,7 +114,8 @@ static int parse_playlist(URLContext *h, const char *url)
char
line
[
1024
];
const
char
*
ptr
;
if
((
ret
=
avio_open
(
&
in
,
url
,
AVIO_FLAG_READ
))
<
0
)
if
((
ret
=
avio_open2
(
&
in
,
url
,
AVIO_FLAG_READ
,
&
h
->
interrupt_callback
,
NULL
))
<
0
)
return
ret
;
read_chomp_line
(
in
,
line
,
sizeof
(
line
));
...
...
libavformat/img2.c
浏览文件 @
9d77a8fa
...
...
@@ -304,7 +304,8 @@ static int read_packet(AVFormatContext *s1, AVPacket *pkt)
s
->
path
,
s
->
img_number
)
<
0
&&
s
->
img_number
>
1
)
return
AVERROR
(
EIO
);
for
(
i
=
0
;
i
<
3
;
i
++
){
if
(
avio_open
(
&
f
[
i
],
filename
,
AVIO_FLAG_READ
)
<
0
)
{
if
(
avio_open2
(
&
f
[
i
],
filename
,
AVIO_FLAG_READ
,
&
s1
->
interrupt_callback
,
NULL
)
<
0
)
{
if
(
i
==
1
)
break
;
av_log
(
s1
,
AV_LOG_ERROR
,
"Could not open file : %s
\n
"
,
filename
);
...
...
@@ -388,7 +389,8 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
return
AVERROR
(
EIO
);
}
for
(
i
=
0
;
i
<
3
;
i
++
){
if
(
avio_open
(
&
pb
[
i
],
filename
,
AVIO_FLAG_WRITE
)
<
0
)
{
if
(
avio_open2
(
&
pb
[
i
],
filename
,
AVIO_FLAG_WRITE
,
&
s
->
interrupt_callback
,
NULL
)
<
0
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"Could not open file : %s
\n
"
,
filename
);
return
AVERROR
(
EIO
);
}
...
...
libavformat/mov.c
浏览文件 @
9d77a8fa
...
...
@@ -1770,7 +1770,8 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
}
}
static
int
mov_open_dref
(
AVIOContext
**
pb
,
char
*
src
,
MOVDref
*
ref
)
static
int
mov_open_dref
(
AVIOContext
**
pb
,
char
*
src
,
MOVDref
*
ref
,
AVIOInterruptCB
*
int_cb
)
{
/* try relative path, we do not try the absolute because it can leak information about our
system to an attacker */
...
...
@@ -1805,7 +1806,7 @@ static int mov_open_dref(AVIOContext **pb, char *src, MOVDref *ref)
av_strlcat
(
filename
,
ref
->
path
+
l
+
1
,
1024
);
if
(
!
avio_open
(
pb
,
filename
,
AVIO_FLAG_READ
))
if
(
!
avio_open
2
(
pb
,
filename
,
AVIO_FLAG_READ
,
int_cb
,
NULL
))
return
0
;
}
}
...
...
@@ -1860,7 +1861,7 @@ static int mov_read_trak(MOVContext *c, AVIOContext *pb, MOVAtom atom)
if
(
sc
->
dref_id
-
1
<
sc
->
drefs_count
&&
sc
->
drefs
[
sc
->
dref_id
-
1
].
path
)
{
MOVDref
*
dref
=
&
sc
->
drefs
[
sc
->
dref_id
-
1
];
if
(
mov_open_dref
(
&
sc
->
pb
,
c
->
fc
->
filename
,
dref
)
<
0
)
if
(
mov_open_dref
(
&
sc
->
pb
,
c
->
fc
->
filename
,
dref
,
&
c
->
fc
->
interrupt_callback
)
<
0
)
av_log
(
c
->
fc
,
AV_LOG_ERROR
,
"stream %d, error opening alias: path='%s', dir='%s', "
"filename='%s', volume='%s', nlvl_from=%d, nlvl_to=%d
\n
"
,
...
...
libavformat/utils.c
浏览文件 @
9d77a8fa
...
...
@@ -593,7 +593,8 @@ static int init_input(AVFormatContext *s, const char *filename)
(
!
s
->
iformat
&&
(
s
->
iformat
=
av_probe_input_format
(
&
pd
,
0
))))
return
0
;
if
((
ret
=
avio_open
(
&
s
->
pb
,
filename
,
AVIO_FLAG_READ
))
<
0
)
if
((
ret
=
avio_open2
(
&
s
->
pb
,
filename
,
AVIO_FLAG_READ
,
&
s
->
interrupt_callback
,
NULL
))
<
0
)
return
ret
;
if
(
s
->
iformat
)
return
0
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录