projects
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3f629c8
)
avformat/utils: Ensure that AVFMT_FLAG_CUSTOM_IO is set before use
author
Michael Niedermayer
<michaelni@gmx.at>
Mon, 20 Apr 2015 20:22:31 +0000
(22:22 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 20 Apr 2015 23:08:16 +0000
(
01:08
+0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit
ba631b791435c395361e2026fc7419b341e57813
)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c
patch
|
blob
|
history
diff --git
a/libavformat/utils.c
b/libavformat/utils.c
index
1ab8bb6
..
d1e0f71
100644
(file)
--- 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;