diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 22:22:31 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-25 15:06:53 +0200 |
commit | 81e4b6f11a01afe459b616511f7d18a8c1464b29 (patch) | |
tree | b2146132d07752a70315e221de1bde4e913b0eda /libavformat/utils.c | |
parent | 8c832e3cc05c4590054cf49630b2f026eec4c734 (diff) | |
download | ffmpeg-81e4b6f11a01afe459b616511f7d18a8c1464b29.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/utils.c')
-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 f1610d6798..ac68a132c5 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -399,6 +399,9 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, 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; |