[SCM] libav/experimental: hls: Add an option to prepend a baseurl to the playlist entries

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 5a70a783f04919514efec7751d710b64d8975fd7
Author: Luca Barbato <lu_zero at gentoo.org>
Date:   Tue Mar 18 21:19:00 2014 +0100

    hls: Add an option to prepend a baseurl to the playlist entries
    
    Useful to generate playlists with absolute paths.
    
    Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

diff --git a/doc/muxers.texi b/doc/muxers.texi
index 09ce4b9..e1c0383 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -114,6 +114,9 @@ Set the maximum number of playlist entries.
 Set the number after which index wraps.
 @item -start_number @var{number}
 Start the sequence from @var{number}.
+ at item -hls_base_url @var{baseurl}
+Append @var{baseurl} to every entry in the playlist.
+Useful to generate playlists with absolute paths.
 @end table
 
 @anchor{image2}
diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index f9e9678..6d6caa1 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -55,6 +55,7 @@ typedef struct HLSContext {
     ListEntry *list;
     ListEntry *end_list;
     char *basename;
+    char *baseurl;
     AVIOContext *pb;
 } HLSContext;
 
@@ -148,6 +149,8 @@ static int hls_window(AVFormatContext *s, int last)
 
     for (en = hls->list; en; en = en->next) {
         avio_printf(hls->pb, "#EXTINF:%d,\n", en->duration);
+        if (hls->baseurl)
+            avio_printf(hls->pb, "%s", hls->baseurl);
         avio_printf(hls->pb, "%s\n", en->name);
     }
 
@@ -319,6 +322,7 @@ static const AVOption options[] = {
     {"hls_time",      "segment length in seconds",               OFFSET(time),    AV_OPT_TYPE_FLOAT,  {.dbl = 2},     0, FLT_MAX, E},
     {"hls_list_size", "maximum number of playlist entries",      OFFSET(size),    AV_OPT_TYPE_INT,    {.i64 = 5},     0, INT_MAX, E},
     {"hls_wrap",      "number after which the index wraps",      OFFSET(wrap),    AV_OPT_TYPE_INT,    {.i64 = 0},     0, INT_MAX, E},
+    {"hls_base_url",  "url to prepend to each playlist entry",   OFFSET(baseurl), AV_OPT_TYPE_STRING, {.str = NULL},  0, 0,       E},
     { NULL },
 };
 

-- 
Libav/FFmpeg packaging