[FFmpeg-devel] [PATCH 2/3] lavf/hls: don't copy empty options; silences HTTP CRLF warnings

Rodger Combs rodger.combs at gmail.com
Mon Sep 21 04:55:34 CEST 2015


---
 libavformat/hls.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index c16c770..a5073ff 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -1317,10 +1317,14 @@ static int save_avio_options(AVFormatContext *s)
 
     while (*opt) {
         if (av_opt_get(s->pb, *opt, AV_OPT_SEARCH_CHILDREN, &buf) >= 0) {
-            ret = av_dict_set(&c->avio_opts, *opt, buf,
-                              AV_DICT_DONT_STRDUP_VAL);
-            if (ret < 0)
-                return ret;
+            if (strlen(buf)) {
+                ret = av_dict_set(&c->avio_opts, *opt, buf,
+                                  AV_DICT_DONT_STRDUP_VAL);
+                if (ret < 0)
+                    return ret;
+            } else {
+                av_free(buf);
+            }
         }
         opt++;
     }
-- 
2.5.1



More information about the ffmpeg-devel mailing list