diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 22:22:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-06-10 02:13:10 +0200 |
| commit | 1a87782c2e55753a3b34dc8f1064dc267401cae8 (patch) | |
| tree | 63e651b42bf79aceda11c5eb2cfde77933112b49 /libavformat | |
| parent | a1f0c1b6fe10c7341679678c959a2784a8e885d0 (diff) | |
| download | ffmpeg-1a87782c2e55753a3b34dc8f1064dc267401cae8.tar.gz | |
avformat/utils: Ensure that AVFMT_FLAG_CUSTOM_IO is set before use
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ba631b791435c395361e2026fc7419b341e57813)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 9309b91cee..76142a7692 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -483,6 +483,9 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, AVInputForma if (options) av_dict_copy(&tmp, *options, 0); + if (s->pb) // must be before any goto fail + s->flags |= AVFMT_FLAG_CUSTOM_IO; + if ((ret = av_opt_set_dict(s, &tmp)) < 0) goto fail; |