From patchwork Thu Mar 1 15:58:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wm4 X-Patchwork-Id: 7777 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.181.170 with SMTP id m39csp5198203jaj; Thu, 1 Mar 2018 07:58:22 -0800 (PST) X-Google-Smtp-Source: AG47ELu7rooxr5lYsbweNRhurN8lp4HKcYNfG0RR9L45ejdZcNm0qLjoSwcDTJ8XfxR55bhlPwXK X-Received: by 10.28.228.131 with SMTP id b125mr2082088wmh.153.1519919902500; Thu, 01 Mar 2018 07:58:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519919902; cv=none; d=google.com; s=arc-20160816; b=LejkU6JOTEsk4ZeNxCoUhBjcjtpBy0tHBhMTzKi8fraoDK1VNVUeESXT7TeGoNOVIB 97O5vHlL6hvRNZZqh+++MQlVglrCUtXsWl5hyziinW8fMAPRwbVcMgG7yHL8MEo9n39E quCwtHHHUHDw4b12UeWyhK5JjtkyoDOQ5YNuc4fRHgAauBGkAoGXmN48ItzFONXdCllY yTRXuPxGdYbrRlIrFC5CTwZKNNXOT/uy8myQeLfFhYDFbjMkmq5QAJPph344E6m8oX+a gN38aYfoDy8/VJLrYLwatt6n/cujjuEAB3aIvPKvdtqS4X/GIJyanNojO6i+P5vJRY/I +PaA== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=ltQYWFgkQnQ2n6TorCZlU2cZIzmq2EWwRCE2RkDgx0o=; b=sIi8l1U7wZ6eAYewOt9pXg7TCL8bmT1lVhqnZRyM/prR1tRT4dfG70lERh12FkmTpo RvUxiCaMBghvCVZc3Tf+luiJJAtDApYOVjd20DdBC8lfv/CwZnKzA9r1zg23TYhaC0aP 6oa2OwORDXsahzIvKS/frc+WouuIh+WlZ3QpFz/6nu7E7VjxcYfIX8Fom4ZHd1SPZ1h7 dgopXLBWJRd4QYGf2pxPHzbzLP+bYLc70xLCnvVTEJi6ZrREDpkmXM+DufTwwhHUFZyp O2YaLYdBXaOf8fpbJyq9tF4rKywX4jxKivm9XkMDZhAQGHCon5VTgQH3qy9ExOfrRsaW hIBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=mxq3OKkW; 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i65si2834733wmg.191.2018.03.01.07.58.21; Thu, 01 Mar 2018 07:58:22 -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; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=mxq3OKkW; 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B0C7A68A41E; Thu, 1 Mar 2018 17:58:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 92348689F79 for ; Thu, 1 Mar 2018 17:58:08 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id z9so13012249wmb.3 for ; Thu, 01 Mar 2018 07:58:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=c+1n1brPAQAeaZyHToUBIs8HxwpiOmA1fc9ZpePDMpw=; b=mxq3OKkWHNC1CRTVI5oh90KwJlaUoOsfx3uKcYYeFCNhRrMqnK7Rd16VBwe8ZQ5t6u ahNTWC2P/K8iQle3hbLs+9Ne2lztYehJlF0di5nwG7A1T7AKrx8iacLcWWDE1slvG08e agg1R8j4IJ3q3AJpjWByxJ9ftpNSsBwRqRpSyMbxJHRlgjiokmz+9d9pv4iWJF8Rnd36 QXt0blK1nv9oc/6G/KQm4Yii0aIQnNiXuPonnil83+D8gHpVQ6lT1hp5yOAq4WacV6hb h9n2wOZuAbtQ8N2EgNlAnCLdKqCySqSwJAlSl5UcHW8Wjlc7YXqKbK5xF6sUzN+cg/h1 fSmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=c+1n1brPAQAeaZyHToUBIs8HxwpiOmA1fc9ZpePDMpw=; b=eATHqNIIqFODd4zmou+2ha97nhStFaqOOKAQ+or6OfxciYYkwIb94Yq6Llzc6uw0XC TbhtX8h5mGfit/kbHkx415LCbTe/Hqtvw4r3cLlFthU179DPo02ZAnMHwbDo0YN5dxjr hm5ypB+GdtoKlbG2rD14+em1Rj5B80IG1pFLD5/r3LXZk0uuAQcCPYBHLzNmKxn48Jm8 SnLdP/RlIhh+fdyQ4ZqQ81XobuqZTvFunzGXNqndZNzbZKdusCcz306vb+gnbHcwEMtM XysVL4tMDNKFx7milN4Rk5sJoCVuwUdFiuWBX2Qz35HvDwO1gXrrfqDJ/92UH48OLAjE lsLw== X-Gm-Message-State: AElRT7E79GKOmukwnk9gKcI/g7mmrhv/24zvN41qJyoDZfWvfkV1482E LT4v6OwBdnV/JCFYng2baXzRBg== X-Received: by 10.28.166.201 with SMTP id p192mr2032473wme.132.1519919893364; Thu, 01 Mar 2018 07:58:13 -0800 (PST) Received: from debian.speedport.ip (p2003006CCD4EDC897558E017D078E109.dip0.t-ipconnect.de. [2003:6c:cd4e:dc89:7558:e017:d078:e109]) by smtp.googlemail.com with ESMTPSA id 62sm4451461wrf.24.2018.03.01.07.58.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Mar 2018 07:58:12 -0800 (PST) From: wm4 To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Mar 2018 16:58:21 +0100 Message-Id: <20180301155822.30477-1-nfxjfg@googlemail.com> X-Mailer: git-send-email 2.16.1 Subject: [FFmpeg-devel] [PATCH 1/2] lavu/frame: fix inconsistent qp_table_buf deprecation 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: wm4 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Everything related to the QP data is deprecated, with qp_table_buf being an inconsistent exception. Some parts were under the deprecation guards, some not. It probably didn't even compile. --- libavutil/frame.c | 7 ++++--- libavutil/frame.h | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libavutil/frame.c b/libavutil/frame.c index 662a7e5ab5..3ecd739317 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -53,11 +53,10 @@ MAKE_ACCESSORS(AVFrame, frame, enum AVColorRange, color_range) #if FF_API_FRAME_QP int av_frame_set_qp_table(AVFrame *f, AVBufferRef *buf, int stride, int qp_type) { +FF_DISABLE_DEPRECATION_WARNINGS av_buffer_unref(&f->qp_table_buf); f->qp_table_buf = buf; - -FF_DISABLE_DEPRECATION_WARNINGS f->qscale_table = buf->data; f->qstride = stride; f->qscale_type = qp_type; @@ -71,12 +70,12 @@ int8_t *av_frame_get_qp_table(AVFrame *f, int *stride, int *type) FF_DISABLE_DEPRECATION_WARNINGS *stride = f->qstride; *type = f->qscale_type; -FF_ENABLE_DEPRECATION_WARNINGS if (!f->qp_table_buf) return NULL; return f->qp_table_buf->data; +FF_ENABLE_DEPRECATION_WARNINGS } #endif @@ -523,7 +522,9 @@ void av_frame_unref(AVFrame *frame) av_freep(&frame->extended_buf); av_dict_free(&frame->metadata); #if FF_API_FRAME_QP +FF_DISABLE_DEPRECATION_WARNINGS av_buffer_unref(&frame->qp_table_buf); +FF_ENABLE_DEPRECATION_WARNINGS #endif av_buffer_unref(&frame->hw_frames_ctx); diff --git a/libavutil/frame.h b/libavutil/frame.h index d54bd9a354..4c3225b8bd 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -529,6 +529,7 @@ typedef struct AVFrame { attribute_deprecated int qscale_type; + attribute_deprecated AVBufferRef *qp_table_buf; #endif /**