From patchwork Sun Dec 31 13:07:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rostislav Pehlivanov X-Patchwork-Id: 7053 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp12579847jad; Sun, 31 Dec 2017 05:07:42 -0800 (PST) X-Google-Smtp-Source: ACJfBovUsxcjiPqduPTfDDwE54kOUNQWxt+FqbQK5cW2y6a9TR1IAW6xA/i+3hi6hHmZx0aCsb/W X-Received: by 10.223.136.118 with SMTP id e51mr40662596wre.21.1514725662084; Sun, 31 Dec 2017 05:07:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514725662; cv=none; d=google.com; s=arc-20160816; b=JRJQVVjDvVadiVC93c6T8RtGAdntlYJmDWwRTHSpmn9NoYIwonNvLRzprw1DdnKSGT n2w1zKmgz2W2nr6y68L2lga5UkIfqf1g2FYWBZixHURKu1AnaJNGodnBIMUtAhis10qF H6q85mgERNo/CAPRRdwpBwgEWLodpKaZO2cxgYf1iD0W/QK0t8Jq0eExTZoF+q0HVQje wM2t+RcJkxtHUSCrEXjIO/MaoBqIO++ZNpEDLnt/2SoTzNRd6WcBKphqL6nEuJvlugwb QOa/ImTkM2T9x7xGfuqb3kLyBMn+EwjsnLbfwu9wV9x2qSheDi1Rk6GLwxQe4Tp1Kcw5 catA== 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=zgZ1GLP+olXDFM2Fco4RgcM3RzysjUVs+MI38qSMWO4=; b=cSf7YnLAKcm6o9v74czst6C0sNFPDiYEFAMzjmGzVWIX3nOU5yoNkjCUD40v+cN2Y0 YXZV7uw10VmrpDTMsRRmHEgZlAqJ5ZaGvP0XKdaIoq/p/LFDR+RHrz22qV00fG55SchD U9jd2pDlv0tpeZrTwvhU1x/4k2aY+BKzD6d8eINe6YO0BVscSZ+gj5UbeiHJvPy1pWPz hn/NOolk7ALMWeCHbYA9ZlapUsoHaeULc9jhACt6QQEbgAIXorur1pPTqZAl6Ach3Jn4 lWZPCBoyLFfF7DZxPVgwBnlZYyyWHYNcTcYSX7xbUzG2IJP0ijgI8FkCXX1nwJB7Gwm6 Xk6w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=BddE1CwX; 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 k82si18417341wmf.103.2017.12.31.05.07.41; Sun, 31 Dec 2017 05:07:42 -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=@gmail.com header.s=20161025 header.b=BddE1CwX; 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 AA00E680942; Sun, 31 Dec 2017 15:07:24 +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 86D18680444 for ; Sun, 31 Dec 2017 15:07:18 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id b76so54649824wmg.1 for ; Sun, 31 Dec 2017 05:07:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Yk7UltS3Ov0LukRChwbpmeU7Gv+RCZKwPfu325+GEmE=; b=BddE1CwX7gnurL1kJ6JaJN1ejZnYKLuzOdl/Hbpq+qpknLLmnPl5bfTP3vJWBN4uHp wgn8Rf20Et1gJ41SgNhZxzLOgEQbun2KZu3Uitqbfotbk8IrcuQ00K+boa4g38te4k3J Q2xdMMK+nfGTzhE1ho9DAbzDY0qrA/Z+OpC1fS3WuW8PzAeBssXkwy6/pXYlBrYtMMKf W7DHTkwgY3veHbTzJfIQ0Ypgaau4unU5Fsfz060+FvTanBFw4azBs30rPAT2YH2JuO2J Wv1Urr3r8WLkl9ftjMFEClkrZkeaJwtpA8PXjPOC45NzE1IyqIId6P/+afRUbRrOqQCl hT4w== 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=Yk7UltS3Ov0LukRChwbpmeU7Gv+RCZKwPfu325+GEmE=; b=JTBOwKkCZNE3wB4eD+eDxGPAraRKNeGpQ7mL33hwXHcr/lB+GkhhHC/OqIWMpEIKE8 h3nMINqLr34qbBpdudfzgZ1zCZmAOdB9f0xwts4Bjbuun9ZfxG8VffygyqvL6Y801mcb IWaQjkZlrQVQNBAFniXfS+VbHmSpEPCIISmRqffvQYMy4/r9FnrnkewC7aLq4dBNUMLM JxbtNvvAwOvJIJwmc7KGh9DBLwsYf3Du5uLGCtlZ+ROoUCOzZmmwp00Qdf1IH3QNDCuW Jcrt8Vvl3DwJ0RqkSXyb70ZBOuI9l54Ogxwbc0AsBYnl3+HLtOVSpTb8e1bhrGFR6oOg LAWA== X-Gm-Message-State: AKGB3mJlbyr1DvgoLFO5l8Cr/bVVZjAAWD5e4HgXuSri8tYfsj5jvt7z uVKGhrsAxACsfBnkOzSbn2Z54Tm6 X-Received: by 10.28.128.73 with SMTP id b70mr31683115wmd.53.1514725652755; Sun, 31 Dec 2017 05:07:32 -0800 (PST) Received: from skyhide.pars.ee ([2a00:23c4:7c83:f700:d430:bdf3:9a4c:8857]) by smtp.gmail.com with ESMTPSA id 53sm28021552wrv.20.2017.12.31.05.07.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 31 Dec 2017 05:07:31 -0800 (PST) From: Rostislav Pehlivanov To: ffmpeg-devel@ffmpeg.org Date: Sun, 31 Dec 2017 13:07:27 +0000 Message-Id: <20171231130728.5335-1-atomnuker@gmail.com> X-Mailer: git-send-email 2.15.1.620.gb9897f4670 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec: move the old decoding/encoding API under and ifdef 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: Rostislav Pehlivanov MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Rostislav Pehlivanov --- libavcodec/avcodec.h | 4 +++- libavcodec/version.h | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c13deb599f..5a27211b80 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -4558,6 +4558,7 @@ int avcodec_enum_to_chroma_pos(int *xpos, int *ypos, enum AVChromaLocation pos); */ enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos); +#if FF_API_OLD_CODING /** * Decode the audio frame of size avpkt->size from avpkt->data into frame. * @@ -4609,7 +4610,7 @@ enum AVChromaLocation avcodec_chroma_pos_to_enum(int xpos, int ypos); * decoding, otherwise the number of bytes consumed from the input * AVPacket is returned. * -* @deprecated Use avcodec_send_packet() and avcodec_receive_frame(). + * @deprecated Use avcodec_send_packet() and avcodec_receive_frame(). */ attribute_deprecated int avcodec_decode_audio4(AVCodecContext *avctx, AVFrame *frame, @@ -4664,6 +4665,7 @@ attribute_deprecated int avcodec_decode_video2(AVCodecContext *avctx, AVFrame *picture, int *got_picture_ptr, const AVPacket *avpkt); +#endif /** * Decode a subtitle message. diff --git a/libavcodec/version.h b/libavcodec/version.h index 47a15d52b8..2886e76860 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -127,7 +127,10 @@ #define FF_API_USER_VISIBLE_AVHWACCEL (LIBAVCODEC_VERSION_MAJOR < 59) #endif #ifndef FF_API_LOCKMGR -#define FF_API_LOCKMGR (LIBAVCODEC_VERSION_MAJOR < 59) +#define FF_API_LOCKMGR (LIBAVCODEC_VERSION_MAJOR < 59) +#endif +#ifndef FF_API_OLD_CODING +#define FF_API_OLD_CODING (LIBAVCODEC_VERSION_MAJOR < 59) #endif