From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 9EF6548D88
for <ffmpegdev@gitmailbox.com>; Wed, 23 Apr 2025 13:00:04 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7A8F1687DA0;
Wed, 23 Apr 2025 16:00:00 +0300 (EEST)
Received: from out203-205-221-149.mail.qq.com (out203-205-221-149.mail.qq.com
[203.205.221.149])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 52A27687D29
for <ffmpeg-devel@ffmpeg.org>; Wed, 23 Apr 2025 15:59:52 +0300 (EEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com;
s=s201512; t=1745413183;
bh=k6aBZJiv1bo+bpVGgR5sicetInZAUffKPxAHu0sqTns=;
h=From:To:Cc:Subject:Date;
b=Es2mVNg5bKYKivn5qBcBPN0kVb18QM4AU+f+iaEWwd5lJX61zy2r4eh4NGsSqkXLS
mcQQ3YoJBqmTuLrwDroIkLtjEct2/s03H2SZEJxmAG9DaqzdbpMNstuz8J4DwGWo1F
72cq0TpEA23oB1ENCyUA+dLdhGZ/mYuXKyxFpC6c=
Received: from localhost.localdomain ([119.147.10.242])
by newxmesmtplogicsvrszc11-0.qq.com (NewEsmtp) with SMTP
id EEA1A49B; Wed, 23 Apr 2025 20:59:42 +0800
X-QQ-mid: xmsmtpt1745413182t6c00zixv
Message-ID: <tencent_33DCEA88D3079C5B4B9AE63C509E66FF6706@qq.com>
X-QQ-XMAILINFO: NT7uTz3cNku2/bz5Ttml3lBBEnsY5yQR8K3hEO+6OvnPX1/4i6zu5uIBTpPomF
7NzvkbR07+iandv50fuWw5y1jenjTigM0Yguvlmuws9/7TjB5WSWcBxpnNtR+utHHk8UK4Ivr/jd
SmFuh0Jt7Q1XYcm/GjSkelTCCbza5QEQ4gLtbMu9X6cas3GiIAVzF2hCZrUeVu0SRnOGD1b0RBxo
wrVTW3Z3Pvj2boLWWnleMcMQIe4ImbXgUNEGGMrrVbnZMHCepBTgj4ajJyarZ4IB3MNYb1A7h/yl
DRqdlKNFPy5DAUcmVNoZD9L1XsuAzZzJUflhK9SCpsaAI24Pl3/NDBNVcJwrM55jGtqSANyyG4E6
cpu8IuNJhbhXmFH0kDgJfVrNStCDhf82WM73vVBooZuDM87jzXXiwuzen4Au6ir+QorEtUAy5GuM
seL/H0uNFLaat8p2VDbsBvSQMcLcJQAgZprx53UkHNci63GJU0IlqUlp5+18YCyls2uLSpLMDgVz
T6JQLHT2QyXCya3bAABKZEfmllPvT5/RZniD86mWLTyog7PKISbOz6vCmUyeh0lPkWeYLNZ7H5Im
rlYoMIp+2+dDs57kJK9OEffmiK/ssKqBvkBhzW9QKN7/ajfNPBXJjfe12vVYsMC6kl/8ysMYjsGI
/OsYhOQ6rzbyM1/lij0n0HCnxRryYaAYFSBD+CFs39sVptnscCvGBiT4es2ODQe65InHOBYObO0C
pwaboMJ1qbBCFVxVLszgFSQNkFOA96Sx5Q4N4PZMOzQA/uQvwidcy0RQjEzH+kTmmo78En+GvP9N
YJpB/zjmuMwRswWkFICeGQyS3Guc4djoZrUrh7vyNlJL4odsoV4CedknWyII5hvx9dd2xRlhwCUX
91sRdZJhNP0lugiuZ4tDEFtTJKg2Sp2oV18Af/MpOxaTGU9eiBo3rcbdyZVMhwPvFbtbj6KR20kT
dXL6gD0oWKWk44iIVlOZJWV5I5fnB6zjRVdVK4n2T65cpu9v2H343CESWxfAMp9jBEnH7nPwk=
X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA=
From: Zhao Zhili <quinkblack-at-foxmail.com@ffmpeg.org>
To: ffmpeg-devel@ffmpeg.org
Date: Wed, 23 Apr 2025 20:59:41 +0800
X-OQ-MSGID: <20250423125941.73422-1-quinkblack@foxmail.com>
X-Mailer: git-send-email 2.46.0
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 1/3] avformat/hls: Fix get key file error
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Zhao Zhili <zhilizhao@tencent.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/tencent_33DCEA88D3079C5B4B9AE63C509E66FF6706@qq.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
From: Zhao Zhili <zhilizhao@tencent.com>
The offset and end_offset options are meant for segment, not for key.
---
libavformat/hls.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/hls.c b/libavformat/hls.c
index c02add99c0..6623c80309 100644
--- a/libavformat/hls.c
+++ b/libavformat/hls.c
@@ -1353,7 +1353,7 @@ static int open_input(HLSContext *c, struct playlist *pls, struct segment *seg,
if (seg->key_type == KEY_AES_128 || seg->key_type == KEY_SAMPLE_AES) {
if (strcmp(seg->key, pls->key_url)) {
AVIOContext *pb = NULL;
- if (open_url(pls->parent, &pb, seg->key, &c->avio_opts, opts, NULL) == 0) {
+ if (open_url(pls->parent, &pb, seg->key, &c->avio_opts, NULL, NULL) == 0) {
ret = avio_read(pb, pls->key, sizeof(pls->key));
if (ret != sizeof(pls->key)) {
av_log(pls->parent, AV_LOG_ERROR, "Unable to read key file %s\n",
--
2.46.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".