From patchwork Thu Aug 24 23:43:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 4829 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp39132jao; Thu, 24 Aug 2017 16:43:44 -0700 (PDT) X-Received: by 10.223.144.99 with SMTP id h90mr5346716wrh.114.1503618224391; Thu, 24 Aug 2017 16:43:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503618224; cv=none; d=google.com; s=arc-20160816; b=g1YOh+eNI5bq1TsIkPr9qb4w/X6rLNVcobbUakXZeiKDOqDhtCzNjrlqhXO4P2wMIw ANGkiYlhIMtZ9Nc0oaq1LoPlLQN3HELPfFFzqoUydEvwRTq4kUm5cdVqOvf6LpkGuKyL LKcOEkoiLo0LUpyhCASqoO5B45kVGxC2UnxtDIvd1L28ixIe0aboK5Z92vYaE4+XRFFE bf9s2BVRkLNL6SnNPPUMek4nBZ3twoM0Yw71Pkr493X0bt1qWhmHbrILa5+EOvZAR8wt vtd06GUi/m7KGqWxNpPuZo0NY6QF8NurAj8QHXAcrTPfwnUcAlpfQTdHBh4UXqAcH7Q9 PHmA== 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: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=P7tpLQqlVTs+CGcS7Qj5bNRp9BmRbQaE7t3pbAdQPOg=; b=zEfw551MA22TmBCkxPnOGUjPJl0v3LC3YkKvvmDtrWxKcsciqElQHZTaMhzyfQxWaj +JejS4i1dh70bDwTG+vYX9OW6O2YJmrd2m2GCowSch4t4bBksOnBiP35kpB46rXRGkyu jSsH7We600fSV6ij6tdpMVitmAkYEdyoSxiJzjZPNkF8xtTJaiBLEX4QFtdIBw2UFD2N 5t3noIBle8nltC+KKyql9sdb1ivE2QIOt5NxPCq92UJcVP3w5SQUoC7KT9szVeXfeCYn 7ZVeO1BaI3vwxnJnQcd2yP+XbKb8bE3Rcjl5+E7zQqYeupqzB6AJLDaqVsa0FH/jLM8i QD5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Vagr9NM/; 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=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 17si266297wrc.395.2017.08.24.16.43.43; Thu, 24 Aug 2017 16:43:44 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Vagr9NM/; 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=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A871A689AF7; Fri, 25 Aug 2017 02:43:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f194.google.com (mail-qk0-f194.google.com [209.85.220.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 61DFB689A7A for ; Fri, 25 Aug 2017 02:43:27 +0300 (EEST) Received: by mail-qk0-f194.google.com with SMTP id o65so907872qkl.2 for ; Thu, 24 Aug 2017 16:43:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=7PRkMEufiFCvxJZoTtMU1Nytfj1+YTXtAOi00DLqR1w=; b=Vagr9NM/FPSTuYIACMjsMHuXn1AmOXXYDUfAaOQqgqq8WHiZspKejfP6jOd26JX24V OOwxYtaHjtu0Uj2uBTp32LEbTeedW7aFqFk2Ky6KfMGsqfC9LiB6HZ90PjMUln5PwS1O p18iZZv/WmyBWGyZlXxd4BcJypsS25BhT1O/DMZpgKI8/BpQdQdkiW0Ae9rVZExj5IVp gBOSFR/bp0v9hZhh+0zU5Gg0OnvaVRf+IG2xwCU2T4AgtTJNrIvS3b9VZuJ42iVT2R/p kth00Hblm0rEg82Sg1CG7e0LAnAP59M6pohSKIKJSnRF+TOZD5SqpEe7xBfHpBL/xNzT 5eqA== 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; bh=7PRkMEufiFCvxJZoTtMU1Nytfj1+YTXtAOi00DLqR1w=; b=CyefXhr7p1mLE4YTKXkgOHNCKIF2KybC1XBY9WD/zJNeO7phEjRxXdTyP+ivPLms2r tAGeYEqX6GBzshh+GZ72Ny2TcBbTazIJdXqyXGA/bqXqeFoKAhxRfwpZ+103eSkWJrYz zdimwOf3/jg0jYEFigKxgMVZMux1Wzw3/03Xlz+1hFfY2pc2tEUAKoEvsTjEImeXaDlW g99bBqLiAAglcgn50JHCaH95wV8ct/wnjhVdGDSz7WMgL/jJIAid2oSaV+PsQxkQrhha DUYEZqxiNKLmsfOBLelaGCqklYInR9gt+FVzxYU/yF7bSeFT3xgNJwginKkQBnioQcM1 8F4g== X-Gm-Message-State: AHYfb5hemZ6nFT4tWzhLvzbp0j9kfxT3H6nydaCqHX3xDOHAs4RRWphq APVaCySTl9kglRcN X-Received: by 10.55.129.135 with SMTP id c129mr10590991qkd.11.1503618214655; Thu, 24 Aug 2017 16:43:34 -0700 (PDT) Received: from localhost.localdomain ([181.231.116.134]) by smtp.gmail.com with ESMTPSA id o39sm3458824qtf.45.2017.08.24.16.43.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Aug 2017 16:43:34 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Aug 2017 20:43:11 -0300 Message-Id: <20170824234311.8096-1-jamrial@gmail.com> X-Mailer: git-send-email 2.13.3 Subject: [FFmpeg-devel] [PATCH] avcodec/imgconvert: remove deprecation guards for a function that's not declared as such 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- The deprecation seems to have been imported from libav but never made effective. libavcodec/imgconvert.c | 2 -- libavcodec/version.h | 3 --- 2 files changed, 5 deletions(-) diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 1547f18966..a349e2a083 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -34,7 +34,6 @@ #include "libavutil/internal.h" #include "libavutil/imgutils.h" -#if FF_API_GETCHROMA void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *v_shift) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); @@ -42,7 +41,6 @@ void avcodec_get_chroma_sub_sample(enum AVPixelFormat pix_fmt, int *h_shift, int *h_shift = desc->log2_chroma_w; *v_shift = desc->log2_chroma_h; } -#endif int avcodec_get_pix_fmt_loss(enum AVPixelFormat dst_pix_fmt, enum AVPixelFormat src_pix_fmt, diff --git a/libavcodec/version.h b/libavcodec/version.h index 7473000579..f41b9caa2d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -60,9 +60,6 @@ #ifndef FF_API_AVCODEC_RESAMPLE #define FF_API_AVCODEC_RESAMPLE FF_API_AUDIO_CONVERT #endif -#ifndef FF_API_GETCHROMA -#define FF_API_GETCHROMA (LIBAVCODEC_VERSION_MAJOR < 58) -#endif #ifndef FF_API_MISSING_SAMPLE #define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 58) #endif