Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
小白菜888
Ffmpeg
提交
cd3716b9
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,发现更多精彩内容 >>
提交
cd3716b9
编写于
12月 11, 2011
作者:
A
Anton Khirnov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Replace all uses of av_close_input_file() with avformat_close_input().
上级
52660454
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
22 addition
and
26 deletion
+22
-26
avconv.c
avconv.c
+2
-2
avplay.c
avplay.c
+1
-2
avprobe.c
avprobe.c
+1
-1
avserver.c
avserver.c
+8
-9
libavfilter/vsrc_movie.c
libavfilter/vsrc_movie.c
+1
-1
libavformat/applehttp.c
libavformat/applehttp.c
+1
-1
libavformat/avidec.c
libavformat/avidec.c
+1
-1
libavformat/mpegts.c
libavformat/mpegts.c
+1
-1
libavformat/rdt.c
libavformat/rdt.c
+1
-1
libavformat/rtpdec_asf.c
libavformat/rtpdec_asf.c
+1
-2
libavformat/rtsp.c
libavformat/rtsp.c
+1
-2
libavformat/sapdec.c
libavformat/sapdec.c
+1
-1
libavformat/seek-test.c
libavformat/seek-test.c
+1
-1
tools/pktdumper.c
tools/pktdumper.c
+1
-1
未找到文件。
avconv.c
浏览文件 @
cd3716b9
...
...
@@ -523,7 +523,7 @@ void exit_program(int ret)
av_dict_free
(
&
output_files
[
i
].
opts
);
}
for
(
i
=
0
;
i
<
nb_input_files
;
i
++
)
{
av
_close_input_file
(
input_files
[
i
].
ctx
);
av
format_close_input
(
&
input_files
[
i
].
ctx
);
}
for
(
i
=
0
;
i
<
nb_input_streams
;
i
++
)
{
av_freep
(
&
input_streams
[
i
].
decoded_frame
);
...
...
@@ -3023,7 +3023,7 @@ static int opt_input_file(OptionsContext *o, const char *opt, const char *filena
ret
=
avformat_find_stream_info
(
ic
,
opts
);
if
(
ret
<
0
)
{
av_log
(
NULL
,
AV_LOG_FATAL
,
"%s: could not find codec parameters
\n
"
,
filename
);
av
_close_input_file
(
ic
);
av
format_close_input
(
&
ic
);
exit_program
(
1
);
}
...
...
avplay.c
浏览文件 @
cd3716b9
...
...
@@ -2593,8 +2593,7 @@ static int decode_thread(void *arg)
if
(
is
->
subtitle_stream
>=
0
)
stream_component_close
(
is
,
is
->
subtitle_stream
);
if
(
is
->
ic
)
{
av_close_input_file
(
is
->
ic
);
is
->
ic
=
NULL
;
/* safety */
avformat_close_input
(
&
is
->
ic
);
}
avio_set_interrupt_cb
(
NULL
);
...
...
avprobe.c
浏览文件 @
cd3716b9
...
...
@@ -325,7 +325,7 @@ static int probe_file(const char *filename)
if
(
do_show_format
)
show_format
(
fmt_ctx
);
av
_close_input_file
(
fmt_ctx
);
av
format_close_input
(
&
fmt_ctx
);
return
0
;
}
...
...
avserver.c
浏览文件 @
cd3716b9
...
...
@@ -849,7 +849,7 @@ static void close_connection(HTTPContext *c)
if
(
st
->
codec
->
codec
)
avcodec_close
(
st
->
codec
);
}
av
_close_input_file
(
c
->
fmt_in
);
av
format_close_input
(
&
c
->
fmt_in
);
}
/* free RTP output streams if any */
...
...
@@ -2169,7 +2169,7 @@ static int open_input_stream(HTTPContext *c, const char *info)
c
->
fmt_in
=
s
;
if
(
strcmp
(
s
->
iformat
->
name
,
"ffm"
)
&&
avformat_find_stream_info
(
c
->
fmt_in
,
NULL
)
<
0
)
{
http_log
(
"Could not find stream info '%s'
\n
"
,
input_filename
);
av
_close_input_file
(
s
);
av
format_close_input
(
&
s
);
return
-
1
;
}
...
...
@@ -2311,8 +2311,7 @@ static int http_prepare_data(HTTPContext *c)
return
0
;
}
else
{
if
(
c
->
stream
->
loop
)
{
av_close_input_file
(
c
->
fmt_in
);
c
->
fmt_in
=
NULL
;
avformat_close_input
(
&
c
->
fmt_in
);
if
(
open_input_stream
(
c
,
""
)
<
0
)
goto
no_loop
;
goto
redo
;
...
...
@@ -2736,7 +2735,7 @@ static int http_receive_data(HTTPContext *c)
/* Now we have the actual streams */
if
(
s
->
nb_streams
!=
feed
->
nb_streams
)
{
av
_close_input_file
(
s
);
av
format_close_input
(
&
s
);
av_free
(
pb
);
http_log
(
"Feed '%s' stream number does not match registered feed
\n
"
,
c
->
stream
->
feed_filename
);
...
...
@@ -2749,7 +2748,7 @@ static int http_receive_data(HTTPContext *c)
avcodec_copy_context
(
fst
->
codec
,
st
->
codec
);
}
av
_close_input_file
(
s
);
av
format_close_input
(
&
s
);
av_free
(
pb
);
}
c
->
buffer_ptr
=
c
->
buffer
;
...
...
@@ -3629,7 +3628,7 @@ static void build_file_streams(void)
if
(
avformat_find_stream_info
(
infile
,
NULL
)
<
0
)
{
http_log
(
"Could not find codec parameters from '%s'
\n
"
,
stream
->
feed_filename
);
av
_close_input_file
(
infile
);
av
format_close_input
(
&
infile
);
goto
fail
;
}
extract_mpeg4_header
(
infile
);
...
...
@@ -3637,7 +3636,7 @@ static void build_file_streams(void)
for
(
i
=
0
;
i
<
infile
->
nb_streams
;
i
++
)
add_av_stream1
(
stream
,
infile
->
streams
[
i
]
->
codec
,
1
);
av
_close_input_file
(
infile
);
av
format_close_input
(
&
infile
);
}
}
}
...
...
@@ -3727,7 +3726,7 @@ static void build_feed_streams(void)
http_log
(
"Deleting feed file '%s' as stream counts differ (%d != %d)
\n
"
,
feed
->
feed_filename
,
s
->
nb_streams
,
feed
->
nb_streams
);
av
_close_input_file
(
s
);
av
format_close_input
(
&
s
);
}
else
http_log
(
"Deleting feed file '%s' as it appears to be corrupt
\n
"
,
feed
->
feed_filename
);
...
...
libavfilter/vsrc_movie.c
浏览文件 @
cd3716b9
...
...
@@ -192,7 +192,7 @@ static av_cold void uninit(AVFilterContext *ctx)
if
(
movie
->
codec_ctx
)
avcodec_close
(
movie
->
codec_ctx
);
if
(
movie
->
format_ctx
)
av
_close_input_file
(
movie
->
format_ctx
);
av
format_close_input
(
&
movie
->
format_ctx
);
avfilter_unref_buffer
(
movie
->
picref
);
av_freep
(
&
movie
->
frame
);
}
...
...
libavformat/applehttp.c
浏览文件 @
cd3716b9
...
...
@@ -132,7 +132,7 @@ static void free_variant_list(AppleHTTPContext *c)
ffurl_close
(
var
->
input
);
if
(
var
->
ctx
)
{
var
->
ctx
->
pb
=
NULL
;
av
_close_input_file
(
var
->
ctx
);
av
format_close_input
(
&
var
->
ctx
);
}
av_free
(
var
);
}
...
...
libavformat/avidec.c
浏览文件 @
cd3716b9
...
...
@@ -1365,7 +1365,7 @@ static int avi_read_close(AVFormatContext *s)
if
(
ast
)
{
if
(
ast
->
sub_ctx
)
{
av_freep
(
&
ast
->
sub_ctx
->
pb
);
av
_close_input_file
(
ast
->
sub_ctx
);
av
format_close_input
(
&
ast
->
sub_ctx
);
}
av_free
(
ast
->
sub_buffer
);
av_free_packet
(
&
ast
->
sub_pkt
);
...
...
libavformat/mpegts.c
浏览文件 @
cd3716b9
...
...
@@ -368,7 +368,7 @@ static void mpegts_close_filter(MpegTSContext *ts, MpegTSFilter *filter)
PESContext
*
pes
=
filter
->
u
.
pes_filter
.
opaque
;
av_freep
(
&
pes
->
buffer
);
/* referenced private data will be freed later in
* av
_close_input_file
*/
* av
format_close_input
*/
if
(
!
((
PESContext
*
)
filter
->
u
.
pes_filter
.
opaque
)
->
st
)
{
av_freep
(
&
filter
->
u
.
pes_filter
.
opaque
);
}
...
...
libavformat/rdt.c
浏览文件 @
cd3716b9
...
...
@@ -544,7 +544,7 @@ rdt_free_context (PayloadContext *rdt)
av_freep
(
&
rdt
->
rmst
[
i
]);
}
if
(
rdt
->
rmctx
)
av
_close_input_file
(
rdt
->
rmctx
);
av
format_close_input
(
&
rdt
->
rmctx
);
av_freep
(
&
rdt
->
mlti_data
);
av_freep
(
&
rdt
->
rmst
);
av_free
(
rdt
);
...
...
libavformat/rtpdec_asf.c
浏览文件 @
cd3716b9
...
...
@@ -108,8 +108,7 @@ int ff_wms_parse_sdp_a_line(AVFormatContext *s, const char *p)
"Failed to fix invalid RTSP-MS/ASF min_pktsize
\n
"
);
init_packetizer
(
&
pb
,
buf
,
len
);
if
(
rt
->
asf_ctx
)
{
av_close_input_file
(
rt
->
asf_ctx
);
rt
->
asf_ctx
=
NULL
;
avformat_close_input
(
&
rt
->
asf_ctx
);
}
if
(
!
(
rt
->
asf_ctx
=
avformat_alloc_context
()))
return
AVERROR
(
ENOMEM
);
...
...
libavformat/rtsp.c
浏览文件 @
cd3716b9
...
...
@@ -580,8 +580,7 @@ void ff_rtsp_close_streams(AVFormatContext *s)
}
av_free
(
rt
->
rtsp_streams
);
if
(
rt
->
asf_ctx
)
{
av_close_input_file
(
rt
->
asf_ctx
);
rt
->
asf_ctx
=
NULL
;
avformat_close_input
(
&
rt
->
asf_ctx
);
}
av_free
(
rt
->
p
);
av_free
(
rt
->
recvbuf
);
...
...
libavformat/sapdec.c
浏览文件 @
cd3716b9
...
...
@@ -52,7 +52,7 @@ static int sap_read_close(AVFormatContext *s)
{
struct
SAPState
*
sap
=
s
->
priv_data
;
if
(
sap
->
sdp_ctx
)
av
_close_input_file
(
sap
->
sdp_ctx
);
av
format_close_input
(
&
sap
->
sdp_ctx
);
if
(
sap
->
ann_fd
)
ffurl_close
(
sap
->
ann_fd
);
av_freep
(
&
sap
->
sdp
);
...
...
libavformat/seek-test.c
浏览文件 @
cd3716b9
...
...
@@ -127,7 +127,7 @@ int main(int argc, char **argv)
printf
(
"ret:%-10s st:%2d flags:%d ts:%s
\n
"
,
ret_str
(
ret
),
stream_id
,
i
&
1
,
ts_buf
);
}
av
_close_input_file
(
ic
);
av
format_close_input
(
&
ic
);
return
0
;
}
tools/pktdumper.c
浏览文件 @
cd3716b9
...
...
@@ -117,7 +117,7 @@ int main(int argc, char **argv)
break
;
}
av
_close_input_file
(
fctx
);
av
format_close_input
(
&
fctx
);
while
(
donotquit
)
sleep
(
60
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录