Re: [FFmpeg-devel] [PATCH] avformat/hlsenc: fix complie error when disable-network

2017-12-04 Thread Steven Liu 
2017-12-04 23:49 GMT+08:00 Tobias Rapp :
> On 04.12.2017 16:36, Steven Liu wrote:
>>
>> Signed-off-by: Steven Liu 
>> ---
>>   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;
>>   }
>>
>
> Thanks, this fixes the compile error.
>
> Nit: there is a typo in the commit subject "complie" -> "compile"
Modify to "fix compiling error when disable-network", and pushed


Thanks
Steven
>
> Regards,
> Tobias
>
>
> ___
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] avformat/hlsenc: fix complie error when disable-network

2017-12-04 Thread Tobias Rapp 

On 04.12.2017 16:36, Steven Liu wrote:

Signed-off-by: Steven Liu 
---
  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;
  }



Thanks, this fixes the compile error.

Nit: there is a typo in the commit subject "complie" -> "compile"

Regards,
Tobias

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] avformat/hlsenc: fix complie error when disable-network

2017-12-04 Thread Steven Liu 
Signed-off-by: Steven Liu 
---
 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;
 }
-- 
2.11.0 (Apple Git-81)



___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel