[FFmpeg-cvslog] avformat/utils: Ensure that AVFMT_FLAG_CUSTOM_IO is set before use
Michael Niedermayer
git at videolan.org
Sat May 16 00:16:07 CEST 2015
ffmpeg | branch: release/2.6 | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 20 22:22:31 2015 +0200| [b942813a413566312acf06b00a710edda68644d1] | committer: Michael Niedermayer
avformat/utils: Ensure that AVFMT_FLAG_CUSTOM_IO is set before use
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit ba631b791435c395361e2026fc7419b341e57813)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b942813a413566312acf06b00a710edda68644d1
---
libavformat/utils.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 1467f31..35a3522 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;
More information about the ffmpeg-cvslog
mailing list