[FFmpeg-cvslog] avformat/hlsenc: fix compiling error when disable-network
Steven Liu
git at videolan.org
Mon Dec 4 17:52:54 EET 2017
ffmpeg | branch: master | Steven Liu <lq at chinaffmpeg.org> | Mon Dec 4 23:52:17 2017 +0800| [d67c1dda403288bcfd30b5d4a0412582728c2c79] | committer: Steven Liu
avformat/hlsenc: fix compiling error when disable-network
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d67c1dda403288bcfd30b5d4a0412582728c2c79
---
libavformat/hlsenc.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index aeeed5bcd2..7dc8f4237b 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -45,7 +45,9 @@
#include "avformat.h"
#include "avio_internal.h"
+#if CONFIG_HTTP_PROTOCOL
#include "http.h"
+#endif
#include "hlsplaylist.h"
#include "internal.h"
#include "os_support.h"
@@ -245,13 +247,15 @@ static int hlsenc_io_open(AVFormatContext *s, AVIOContext **pb, char *filename,
AVDictionary **options) {
HLSContext *hls = s->priv_data;
int http_base_proto = is_http_proto(filename);
- int err;
+ int err = AVERROR_MUXER_NOT_FOUND;
if (!*pb || !http_base_proto || !hls->http_persistent) {
err = s->io_open(s, pb, filename, AVIO_FLAG_WRITE, options);
+#if CONFIG_HTTP_PROTOCOL
} else {
URLContext *http_url_context = ffio_geturlcontext(*pb);
av_assert0(http_url_context);
err = ff_http_do_new_request(http_url_context, filename);
+#endif
}
return err;
}
More information about the ffmpeg-cvslog
mailing list