From patchwork Fri Mar 1 07:19:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rodger Combs X-Patchwork-Id: 12174 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 914AE4474C9 for ; Fri, 1 Mar 2019 09:20:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6DE8968974C; Fri, 1 Mar 2019 09:20:36 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0C57268825F for ; Fri, 1 Mar 2019 09:20:30 +0200 (EET) Received: by mail-io1-f49.google.com with SMTP id x3so18796188ior.6 for ; Thu, 28 Feb 2019 23:20:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=91HTK8ic+VnR2bFoL8Xrg8WFHm7ty8f560OMTiexotA=; b=Ph6huKv0vtvNsXxwAHvjsX10vAKbOBCEdw4u+ftMj/4Zr1D+kPxx60oVlHUJb7cEIS JqwPgCvnskArSV/IPJcVf4y0axa75zFksjJlAbUiazG2HibYDY9seDGMiozVYtxzzg+j DxzKcqT5IO/HbVChKkx2RWQii+frtjxW8SnTiTF+3ZA9Jo+b7TVyB2E2Ru9y4kR+x60g tvF5FwEdjPow0VJM3bpdoNwFgjNseK2NlZ/ySx7p+6dFxUkav1x6w0pAKhDUXPB3Own9 zYtPTGslBcWezN2Cf/lviuYolYYEk/2V0G564Vi/VEHfJ4kw6fBmJLZl0wN/jvJmnATm WbIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=91HTK8ic+VnR2bFoL8Xrg8WFHm7ty8f560OMTiexotA=; b=cGAu+Oa5PGMnyzBQ08pKjx3vaNvGo/VDsFHwc2C+Zbmuk8TZWNoWuucOZgqkXN2bj7 pws03S+QspVqqWNELq+OBt0myPRbjfW30rvj6lLHR7HFuJMKoSPkqDSRw7k3dxMXvolz WHKY3Qvw84RcM9Hs2QE1azQCAO079PqeR9zvmbVW+iJjlvmbOhntYhd2Hk7ODHqH2hCp 7s59bmeEDK7peayK2zzkfC+klugZxBViKBDhNNSGxMtochnmUM4BvELN3CanW5Hm+Lr5 FTS2nP4blrxRsL/G+Zj++0zoFAfo06rVEJ8/m+hl5ghBdF0jsgExfF8vj4RRWjwSLeyP 7mzg== X-Gm-Message-State: APjAAAW5eyO5RqZ2CfY/WoZwOXXpr5cj13yh0ZRO+ZE9af8uf8xHWPQ8 AYw5yfibrJxaZxjQkgLrPPTh8Mwq X-Google-Smtp-Source: APXvYqyM5eRjv+GKEuLmEYFdw1v+TgLl6b+F98s4BZGXFZ90BZcvkxADKqtrYkSmmN0vuVpU8h7OWg== X-Received: by 2002:a6b:6507:: with SMTP id z7mr1705612iob.275.1551424827911; Thu, 28 Feb 2019 23:20:27 -0800 (PST) Received: from MacBook-Pro.localdomain ([71.201.155.37]) by smtp.gmail.com with ESMTPSA id j143sm4149887itj.16.2019.02.28.23.20.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Feb 2019 23:20:27 -0800 (PST) From: Rodger Combs To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Mar 2019 01:19:57 -0600 Message-Id: <20190301071956.56091-1-rodger.combs@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavf/hlsdec: fix support for large initialization segments X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/hls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/hls.c b/libavformat/hls.c index fc9110356d..c56ead507b 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1553,7 +1553,7 @@ reload: if (v->init_sec_buf_read_offset < v->init_sec_data_len) { /* Push init section out first before first actual segment */ int copy_size = FFMIN(v->init_sec_data_len - v->init_sec_buf_read_offset, buf_size); - memcpy(buf, v->init_sec_buf, copy_size); + memcpy(buf, v->init_sec_buf + v->init_sec_buf_read_offset, copy_size); v->init_sec_buf_read_offset += copy_size; return copy_size; }