[FFmpeg-cvslog] lavf/hls: don't convert NULL options to empty strings; fixes HTTP CRLF warnings

Rodger Combs git at videolan.org
Fri Oct 9 11:14:41 CEST 2015


ffmpeg | branch: master | Rodger Combs <rodger.combs at gmail.com> | Sun Sep 20 21:50:22 2015 -0500| [f00ec7eb1b94b31ffdb11a54adda339f08ace245] | committer: Rodger Combs

lavf/hls: don't convert NULL options to empty strings; fixes HTTP CRLF warnings

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f00ec7eb1b94b31ffdb11a54adda339f08ace245
---

 libavformat/hls.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/hls.c b/libavformat/hls.c
index ebd3f95..ff95519 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -1300,7 +1300,7 @@ static int save_avio_options(AVFormatContext *s)
     int ret = 0;
 
     while (*opt) {
-        if (av_opt_get(s->pb, *opt, AV_OPT_SEARCH_CHILDREN, &buf) >= 0) {
+        if (av_opt_get(s->pb, *opt, AV_OPT_SEARCH_CHILDREN | AV_OPT_ALLOW_NULL, &buf) >= 0) {
             ret = av_dict_set(&c->avio_opts, *opt, buf,
                               AV_DICT_DONT_STRDUP_VAL);
             if (ret < 0)



More information about the ffmpeg-cvslog mailing list