From patchwork Tue Jul 25 03:42:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 4452 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp4978346vsb; Mon, 24 Jul 2017 20:44:48 -0700 (PDT) X-Received: by 10.223.182.168 with SMTP id j40mr20044904wre.122.1500954288496; Mon, 24 Jul 2017 20:44:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500954288; cv=none; d=google.com; s=arc-20160816; b=lv/J+JyZd65Qha9bD1dD0MIcCoTdUpefdi9eiZxPjSbY9Ne9xU/QrT68/wKAoYlrPR ma2MGfcCKV7QnHB0jSikJmlI4tyZsaH34XwUXfZSXvpiYbeCsZzYG+Ctgv5rGNHlU7A9 LFZ3KpCOirbjE4OpWuPc01ayJjH7svL7p5UfQzV3if76rAv1o8ndpQyE2O2AsilCjA/e Qfv8zvhgZwoY1dvLh7Y9HgWJwaAX7LnB+33uIzI5fPsenBkyioudsrhlsIXWdO4bLrdT LZk/wgzuYn/gHGhDUxVHzmuzCyaVw2EEJydIsLY9+ghPXpInUlYipX7VCfvmi5DOss3G 8wcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:feedback-id:message-id:date:to:from :delivered-to:arc-authentication-results; bh=uWNDVU9BDiYoHGuI1SPY8piCgkNBiDhip7cP0kD/ANU=; b=cLe6buqfhFLD/n6LRhZ++GsmuA75/bUPp9aIMEVOYzmeBKXXmSeY7AWDG7XJkQstPF FIRfHJSlRHUviY4WnWGprh5gGr7KR4rYVZpqmWUjYfREP2ee896UOVL4u1Jo4lI0eCII mwRevXZAlPw3+PnLq42BQCyEoAqZA4Tkhu0R96GMXNGQC9aG8qg0BGUgNdfoAZ0C7Iuw 2yH9jjkH+uK1WMx9NQsHZUL5uJpRUejeDwqCn5yn/ijFGl/1pFAf2LytugMB2LR4+OBL vRYj82K8AL2s/TrSRPedJDqANEpf/WfpHUuZlRsrM0ERnuXnDj7X3XeAEbd+ecFasq59 izcw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 92si5188092wrg.1.2017.07.24.20.44.47; Mon, 24 Jul 2017 20:44:48 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 751EC689B83; Tue, 25 Jul 2017 06:44:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg320.qq.com (smtpbg320.qq.com [14.17.32.29]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ADD25680A95 for ; Tue, 25 Jul 2017 06:44:36 +0300 (EEST) X-QQ-mid: bizesmtp9t1500954163tyu5vswra Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Tue, 25 Jul 2017 11:42:43 +0800 (CST) X-QQ-SSF: 01100000004000F0FG50B00A0000000 X-QQ-FEAT: DL8BXQjj6qoP+GdfHC3T9BbrciIYPSIDEKiuxvmqfr0k6g7BVDS11XbZDco21 TrTI9LQWmN+mvN5imajpMQRoRraIPR4CqMfuWGBBfqeyWCqN6ejpX+Wpmsuueoq18x3Px8r cLwDECUXvkzLqzFGC2yJEJ5c/Ez0atbm409rEBCADH+yrGUfhy7TRQnpsb1+VIJDsroZUPk T5oWB3LmO8QrjFiMaZ6RSE6FionVnlLhSVtfvBn9KoiUQjti9UyCo/KSnGIGJMEepRahCHb gE8w== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Jul 2017 11:42:40 +0800 Message-Id: <20170725034240.9109-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] doc/libav-merge: remove the hls merge TODO 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 Cc: Steven Liu , Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Steven Liu because the commit id 3c7fa8cbb93dba96acb12aef6e00d929c1da1ae8 have been done for OPENSSL at hlsenc. Signed-off-by: Steven Liu --- doc/libav-merge.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt index 690c4ef97f..96b008b71b 100644 --- a/doc/libav-merge.txt +++ b/doc/libav-merge.txt @@ -105,7 +105,6 @@ Collateral damage that needs work locally: - Merge proresdec2.c and proresdec_lgpl.c - Merge proresenc_anatoliy.c and proresenc_kostya.c - Fix MIPS AC3 downmix -- hlsenc encryption support may need some adjustment (see edc43c571d) Extra changes needed to be aligned with Libav: ----------------------------------------------