eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-13 10:30:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

lavf: use the io_open callbacks for files opened from open_input() as well

Browse Source 
There is no real reason to treat them differently.
This commit is contained in:
Anton Khirnov
2016-02-19 19:36:24 +01:00
parent 5efd91284e
commit 7fbb3b5b98
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/avformat.h
View File

@@ -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

4
libavformat/utils.c
View File

@@ -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;