Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
7fbb3b5b
Commit
7fbb3b5b
authored
Feb 19, 2016
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: use the io_open callbacks for files opened from open_input() as well
There is no real reason to treat them differently.
parent
5efd9128
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
avformat.h
libavformat/avformat.h
+3
-3
utils.c
libavformat/utils.c
+2
-2
No files found.
libavformat/avformat.h
View file @
7fbb3b5b
...
@@ -1237,9 +1237,9 @@ typedef struct AVFormatContext {
...
@@ -1237,9 +1237,9 @@ typedef struct AVFormatContext {
/**
/**
* A callback for opening new IO streams.
* A callback for opening new IO streams.
*
*
*
Certain muxers or demuxers (e.g. for various playlist-based formats) need
*
Whenever a muxer or a demuxer needs to open an IO stream (typically from
*
to open additional files during muxing or demuxing. This callback allows
*
avformat_open_input() for demuxers, but for certain formats can happen at
*
the caller to provide custom IO in such cases
.
*
other times as well), it will call this callback to obtain an IO context
.
*
*
* @param s the format context
* @param s the format context
* @param pb on success, the newly opened IO context should be returned here
* @param pb on success, the newly opened IO context should be returned here
...
...
libavformat/utils.c
View file @
7fbb3b5b
...
@@ -200,8 +200,8 @@ static int init_input(AVFormatContext *s, const char *filename,
...
@@ -200,8 +200,8 @@ static int init_input(AVFormatContext *s, const char *filename,
(
!
s
->
iformat
&&
(
s
->
iformat
=
av_probe_input_format
(
&
pd
,
0
))))
(
!
s
->
iformat
&&
(
s
->
iformat
=
av_probe_input_format
(
&
pd
,
0
))))
return
0
;
return
0
;
if
((
ret
=
avio_open2
(
&
s
->
pb
,
filename
,
AVIO_FLAG_READ
,
ret
=
s
->
io_open
(
s
,
&
s
->
pb
,
filename
,
AVIO_FLAG_READ
,
options
);
&
s
->
interrupt_callback
,
options
))
<
0
)
if
(
ret
<
0
)
return
ret
;
return
ret
;
if
(
s
->
iformat
)
if
(
s
->
iformat
)
return
0
;
return
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment