ffmpeg | branch: release/2.5 | Michael Niedermayer <michae...@gmx.at> | Mon Apr 20 22:22:31 2015 +0200| [5fd5b8ef79c074d5830f2213009601a399f9c952] | committer: Michael Niedermayer
avformat/utils: Ensure that AVFMT_FLAG_CUSTOM_IO is set before use Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit ba631b791435c395361e2026fc7419b341e57813) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5fd5b8ef79c074d5830f2213009601a399f9c952 --- libavformat/utils.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index 1ab8bb6..d1e0f71 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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
