From patchwork Thu Jul 27 10:25:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 4469 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp1841614vsb; Thu, 27 Jul 2017 03:27:43 -0700 (PDT) X-Received: by 10.28.232.29 with SMTP id f29mr3065139wmh.55.1501151263635; Thu, 27 Jul 2017 03:27:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501151263; cv=none; d=google.com; s=arc-20160816; b=QieWHsLlkLaA/pZBkkuNUVpiI3pHhr4WWr2BB++h0ScwO/WwYVGXFM5ZMuR/CS3gxC 6rJAXiXWhN9R96z0/fTk8vAFb75KKyFioKfcTiclMkH93dJzQV7n06TPfZL2TK6cWEkv taEIaSjwx5TOLQMSxFypk4XlH+aX7G85Ndfw691xyD2hQqdcxMRPbYcRWaEZfSTnNMWn UnHoU3/KMPLCoD29XfgQRpxzpWWOV8aqDtonDgItgywhbyBu6U5wp20eOdEBaVxHekec ImOXr2Xh/ZD49CFGcLcMthGedGjnuKrP4yLI2YwPh+5LKfWfRhT/ll+Xdi/fDlHh7bQk BT8g== 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:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=USzGdLDPzixYmR9trrCaaedWUGDmZ7Op7RK4gJ5yf8A=; b=OAw+UKPEZxQ/o38EVnKNToN3tOeUfnRkgNH2Dg+16dGnTvKRGHSWl5xdvT5MmiTZD4 E+FsPz5yGZEcM9Unmsor7/qHil+Ee2SnhrHOiZHB52xK9olDMhpm1wSsMF3HP4rkllGl NfD3J9wyZyQoK7afVV8Bv6DGOwEFwepTlLMpHBUA1DZsLlKLA6lgMUrYLRJqi7d5n+jv B+Gt8i+IZ+MRf9jWFEWvsuU5WubD4ap7oXm4rJ3RdNBLPrHG+B16SyFX1S2+/LhgQied 7EFVvWj8rWiI1s0H6bSrWERyXiJgKC5iSrs90AoMiEcMLpDPva1zf7CtNMPiNaj61lN9 4CIA== 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 y8si6797344wmg.114.2017.07.27.03.27.42; Thu, 27 Jul 2017 03:27:43 -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 D2A2968075B; Thu, 27 Jul 2017 13:27:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg339.qq.com (smtpbg339.qq.com [14.17.44.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 699066805C5 for ; Thu, 27 Jul 2017 13:27:31 +0300 (EEST) X-QQ-mid: bizesmtp1t1501151143tknngdfmw Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Thu, 27 Jul 2017 18:25:42 +0800 (CST) X-QQ-SSF: 01100000004000F0FG50B00A0000000 X-QQ-FEAT: r6ak3Hgn9+kRHFe9yPjnYnNCEBMGhGmYz+lCwAnze2mSqtK3AKTkHpNrTS9M+ Pp+Yt2BUhF+SJJ6CXwYuJTfJSvUuLBQBW64pYGCCyT8BXkHEhrZu23Z9IJJZ5WjKixop2By zL3xZc6cSC7joykGu6DFn8WCQsnXFs1KPMaiUZkl84uuHoGOF9yUV9cdSolYNzWtEy1lC1v x8Jg47Z6kN8yLCshE40HB/oUkVaHYlMlKqSEXJWgz8dmQ1eDVZDRzjISw4HfmdV3FrbfAC6 6jdA== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Thu, 27 Jul 2017 18:25:38 +0800 Message-Id: <20170727102538.14508-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty In-Reply-To: <20170727055512.GE7839@golem.pkh.me> References: <20170727055512.GE7839@golem.pkh.me> X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v2] 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" This TODO is done. See 5caaa3a49e76b084ff8a9840d541bad64d96d7f7 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: ----------------------------------------------