aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-20 22:22:31 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-21 01:08:16 +0200
commit5fd5b8ef79c074d5830f2213009601a399f9c952 (patch)
tree44a24cf659408a63224c43376b5d9506d7630a15
parent3f629c83b462bbafbc262fbc7f1488a2d8f3b13e (diff)
downloadffmpeg-5fd5b8ef79c074d5830f2213009601a399f9c952.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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 1ab8bb646b..d1e0f7139d 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;