diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-20 22:22:31 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-15 10:04:50 +0200 |
| commit | b942813a413566312acf06b00a710edda68644d1 (patch) | |
| tree | 6f08a8c55eece2eec11ae4dcfbdad9664690beee | |
| parent | a75f293264f304e905f07cfa2debb070af2981e4 (diff) | |
| download | ffmpeg-b942813a413566312acf06b00a710edda68644d1.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>
| -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 1467f31b1e..35a35227a7 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -418,6 +418,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; |