From patchwork Wed Dec 6 00:36:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stebbins X-Patchwork-Id: 6561 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp6329186jah; Tue, 5 Dec 2017 16:37:18 -0800 (PST) X-Google-Smtp-Source: AGs4zMbHgPJLxxGcxvtDr5Wse+1ac6i4As2P/F1murPsU5xXyBublm1FfhUHJoEokisliVlcPjd6 X-Received: by 10.223.184.173 with SMTP id i42mr19078530wrf.31.1512520638199; Tue, 05 Dec 2017 16:37:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512520638; cv=none; d=google.com; s=arc-20160816; b=ZNcMNtYUMXjPbMO6Prosh3TEhu86vrjs0a/B4b2YxE6bvHBxcrr7YBei41vRuICVhr 3JhRvpUSUNIo8eQ0U5HnzbA+OjiglzpFtmIYMMuWFsthXvqxK8QqqZ3SHNR8jC9OBBuj V/EkNpASum5If/XLg/56v9/5n3aEuYL3rSKb8vIyhzihl1x8w2x3HkFqYCOcACmfWI6S Vr6VdaB/n1z80sbAcRcyeZENQZ8yoV8rzYrAsjMIgFV3YmPZuH4tzdHXVwtGwVkrKgzL oF7j8LNtzvhZSKbsxW1eXvKWUs0b6y/cXGBOJUazcYwicSmPmdwlE6R4IQtHvIRIG/Kg 6D3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to:arc-authentication-results; bh=/zdEIno2GgRHqKdH5EPnCKdsWIse/VWl2BL2RDV7r+g=; b=GcYKrfjSWoLhJVoa/Nh7WLFEWZN6JFAN+CCuaBoWpKSie4kfioxLsMccxd+0DsnxFE iZsowhm0Gg+WZXBJ5JVqAV7k2C6+xxUZvDDwwHvVvRYKR49N1cy9aDNV+ERfatGMKdrB eQKseu22LQI8aEIXEfwaeSv0q/EqpfPq8x69RiNRFiIWY8utYii2Y7H8YfeoNOSTYusA VHZq6SD+pQEW+ZW29Df2kaKVgLA5eMvuWEHPV+98i3ddJ8hn3MgvRaGriS6mKUYFOSu8 YxPjJRSDBuPQ6UIB5p0TA/TKeslD6+1EwtZ3B50Wg+3Zd/QJ4ybawhAGa5oehQfsKWvL lwdw== 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 v13si1024537wmc.146.2017.12.05.16.37.17; Tue, 05 Dec 2017 16:37:18 -0800 (PST) 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 212F168A395; Wed, 6 Dec 2017 02:37:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.jetheaddev.com (mail.jetheaddev.com [70.164.99.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6ECB268A37A for ; Wed, 6 Dec 2017 02:37:04 +0200 (EET) Received: from dionysus.jetheaddev.com (10.13.12.63) by cas.jetheaddev.com (192.168.13.27) with Microsoft SMTP Server (TLS) id 14.3.351.0; Tue, 5 Dec 2017 16:37:03 -0800 Received: from dionysus.jetheaddev.com (localhost [127.0.0.1]) by dionysus.jetheaddev.com (8.15.2/8.14.7) with ESMTP id vB60b34B020515 for ; Tue, 5 Dec 2017 16:37:03 -0800 Received: (from jstebbins@localhost) by dionysus.jetheaddev.com (8.15.2/8.15.2/Submit) id vB60b31Z020514 for ffmpeg-devel@ffmpeg.org; Tue, 5 Dec 2017 16:37:03 -0800 From: John Stebbins To: Date: Tue, 5 Dec 2017 16:36:58 -0800 Message-ID: <20171206003658.20450-2-jstebbins@jetheaddev.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171206003658.20450-1-jstebbins@jetheaddev.com> References: <20171206003658.20450-1-jstebbins@jetheaddev.com> MIME-Version: 1.0 X-Originating-IP: [10.13.12.63] Subject: [FFmpeg-devel] [PATCH 3/6] lavc/libx265: mark disposable frames 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" Used by movenc to fill sdtp box --- libavcodec/libx265.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 4456e300f2..69bfc4fdaa 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -329,6 +329,13 @@ FF_DISABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS #endif +#if X265_BUILD >= 130 + if (x265pic_out.sliceType == X265_TYPE_B) +#else + if (x265pic_out.frameData.sliceType == 'b') +#endif + pkt->flags |= AV_PKT_FLAG_DISPOSABLE; + *got_packet = 1; return 0; }