[FFmpeg-cvslog] avformat/hls: support avio_seek in encryption mode

Steven Liu git at videolan.org
Mon Aug 10 10:53:33 EEST 2020


ffmpeg | branch: master | Steven Liu <lq at chinaffmpeg.org> | Wed Jul 22 17:15:28 2020 +0800| [6e4bba40557613282a10dadb5a0a9c5f5f500987] | committer: Steven Liu

avformat/hls: support avio_seek in encryption mode

Signed-off-by: Steven Liu <liuqi05 at kuaishou.com>

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

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

diff --git a/libavformat/hls.c b/libavformat/hls.c
index cf0b71d65d..84f0a5f323 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -1291,7 +1291,7 @@ static int open_input(HLSContext *c, struct playlist *pls, struct segment *seg,
      * as would be expected. Wrong offset received from the server will not be
      * noticed without the call, though.
      */
-    if (ret == 0 && !is_http && seg->key_type == KEY_NONE && seg->url_offset) {
+    if (ret == 0 && !is_http && seg->url_offset) {
         int64_t seekret = avio_seek(*in, seg->url_offset, SEEK_SET);
         if (seekret < 0) {
             av_log(pls->parent, AV_LOG_ERROR, "Unable to seek to offset %"PRId64" of HLS segment '%s'\n", seg->url_offset, seg->url);



More information about the ffmpeg-cvslog mailing list