ffmpeg | branch: master | Aman Gupta <a...@tmm1.net> | Mon Dec 25 11:33:06 2017 -0800| [a232a72d77cf32766e7f42f892b983f5e496653f] | committer: Aman Gupta
avformat/hls: return AVERROR_PROTOCOL_NOT_FOUND when http protocol is not available Fixes compile error when building with network or protocols disabled. This code would never be reached (because the demuxer fails much earlier on http playlists or segments), so it doesn't matter much what we do here as long as it compiles. Signed-off-by: Aman Gupta <a...@tmm1.net> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a232a72d77cf32766e7f42f892b983f5e496653f --- libavformat/hls.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavformat/hls.c b/libavformat/hls.c index d2cbb47f15..c0bade0e84 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -611,6 +611,9 @@ static void update_options(char **dest, const char *name, void *src) static int open_url_keepalive(AVFormatContext *s, AVIOContext **pb, const char *url) { +#if !CONFIG_HTTP_PROTOCOL + return AVERROR_PROTOCOL_NOT_FOUND; +#else int ret; URLContext *uc = ffio_geturlcontext(*pb); av_assert0(uc); @@ -620,6 +623,7 @@ static int open_url_keepalive(AVFormatContext *s, AVIOContext **pb, ff_format_io_close(s, pb); } return ret; +#endif } static int open_url(AVFormatContext *s, AVIOContext **pb, const char *url, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
