aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-20 22:22:31 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-17 21:50:08 +0200
commitf494b906e344ea9711065b2de23ab2d69e9dd364 (patch)
tree3e9707bcceec3ffa5103de447a0231c3fd1d958d
parent249021eb23368f81ff4db19f538ae4a96bb56878 (diff)
downloadffmpeg-f494b906e344ea9711065b2de23ab2d69e9dd364.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 b56a40f664..79bdb87109 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -537,6 +537,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;