diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-11-05 12:30:21 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-11-13 13:21:46 +0100 |
| commit | 32caa7b13cecca59213c73fa94dd683c2b003bfd (patch) | |
| tree | 5d7285bd0ddc0418a607f441e8c366f68df69d4c /libavformat/utils.c | |
| parent | 9d77a8faf9568f02daf06903559473efb4050c34 (diff) | |
| download | ffmpeg-32caa7b13cecca59213c73fa94dd683c2b003bfd.tar.gz | |
lavf: pass options from AVFormatContext to avio.
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 399b709961..2dc7623dff 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -575,7 +575,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename, #endif /* open input file and probe the format if necessary */ -static int init_input(AVFormatContext *s, const char *filename) +static int init_input(AVFormatContext *s, const char *filename, AVDictionary **options) { int ret; AVProbeData pd = {filename, NULL, 0}; @@ -594,7 +594,7 @@ static int init_input(AVFormatContext *s, const char *filename) return 0; if ((ret = avio_open2(&s->pb, filename, AVIO_FLAG_READ, - &s->interrupt_callback, NULL)) < 0) + &s->interrupt_callback, options)) < 0) return ret; if (s->iformat) return 0; @@ -619,7 +619,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputForma if ((ret = av_opt_set_dict(s, &tmp)) < 0) goto fail; - if ((ret = init_input(s, filename)) < 0) + if ((ret = init_input(s, filename, &tmp)) < 0) goto fail; /* check filename in case an image number is expected */ |