aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-20 22:22:31 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-22 12:27:25 +0200
commit74e714f81597f09401252a72388cc788ed4a6a1a (patch)
treedd37c15673dbe3a7660c2c013f6846c410ff62ca /libavformat/utils.c
parentd18f8959b3c6374846c83ec28f1761e8e3253929 (diff)
downloadffmpeg-74e714f81597f09401252a72388cc788ed4a6a1a.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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 5465498c3d..3a979c63ee 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -508,6 +508,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;