From patchwork Wed Feb 14 00:18:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 7590 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp139587jai; Tue, 13 Feb 2018 16:18:32 -0800 (PST) X-Google-Smtp-Source: AH8x2258Z84TKihN1ga0TC/8XgR9MbJrw+bPYGiD2Yh339mG6Ig7/OtGlyEWfDvHofzwFGUY/U0x X-Received: by 10.223.131.230 with SMTP id 93mr2581048wre.59.1518567512248; Tue, 13 Feb 2018 16:18:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518567512; cv=none; d=google.com; s=arc-20160816; b=iR93YvPMKhT9jw0XmeuQ4llibC4Tr/SjgenSxHN0Rfk/KCVLVqY3md1L9CJjHsXAhb sqwi5dgtJ+ng5WfhOgtQYViJGHeDpRQp/NX/7h48ogAhGPHWpg5NZEcQRbeAeEq2IqI8 tQKW3eirj9M617CmHasTgFtbLMpkzRaVjNlM0Z/5h0w9o9W0MRwBTQPDVkVPupZvXDiu iI3aKgA934fiy6hZH5vs0g4PgkYEPNSnOhtmrnsYMGD1TlhuZ9cyw4nMxyYWPtqQzpVi 95lIaCqbXQEqQltH5X6oHfpuzEzyTjkeL1/ry2DrjqCEaYvk5nfSI0QGJ/As1VHq2+GY OpKA== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=LfzbdaRZZzsOGrfXoooWmYFE0H7uIXXu7KsFNTrjVA4=; b=rqPYSWPhiRTf4MyY8lbSX+Xxv/T/vwmTLtcE8wCH/bueBj7wpbP0pVzzec4pExhck8 c+f356uBS0qQbpRgivzkpD0HsgkRrAgYIoOu8PuLbiVbguF5r9TuIs5mtkNo3a/sAw8z /EHB/oxCGmROu9LbsX9UBM5M6C3QcgpmsYbQXDdQqsl4z9n63H9cNLDcrKOPLawfd1we Q2ghOhfutrjnPPfKwkNRay8e03QUcqOlBv8O2f0OxzyzeEQx0/1YOn0NbgTCuE1ssFit RLLk0G1BJwuAKwm2bz2aUkd28ZLp+ZgCtXERy9+qFezlhS8+C/AiHGQ+6fOOZfAnArSy Zg4A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=mLyJKjhT; 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=QUARANTINE 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 s6si8945252wrf.72.2018.02.13.16.18.31; Tue, 13 Feb 2018 16:18:32 -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=mLyJKjhT; 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=QUARANTINE 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 0AB07689E04; Wed, 14 Feb 2018 02:18:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BDC7A689D80 for ; Wed, 14 Feb 2018 02:18:08 +0200 (EET) Received: by mail-qt0-f195.google.com with SMTP id x27so5748102qtm.12 for ; Tue, 13 Feb 2018 16:18:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=w90sBegSPveUZMxEJQbTZHOViBcIEP1XD8274nopADE=; b=mLyJKjhTQZ780WUA9PeWnt2ISNpTQJhiX4b7mYaod9Hxr7FnD+6nbPuHfzzLbQn+jy LPiDJUmj0ULM2mMQU6C4tc+JFiEgYUcyELIDINzcfSY6SJRndiiPKDrBkbGNF6DAdBmZ /epqa5AwmVbrF9ske0XNZeSEuPKxzZIJv47QSBzuvKDBSpFcrQ3R8mqx1bEXCyfLjFVL EZbyyHcFzvF5pkbq/6ZSgTZ0xRLVyaU4qT/4SM/YaTvJ38/BD9Um6W2qjsh8opZtdlYx yxawGc9CspQhkc2Quacj4mmGL8+B8C8lfiWuqt5IAuvwp9T1g1nniR3wFCaFBx1l54gJ uKfA== 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:in-reply-to :references; bh=w90sBegSPveUZMxEJQbTZHOViBcIEP1XD8274nopADE=; b=mw7RLSS9+LfSHFxdGoaivtmroOsP/nzDIQ2mFUi8YZKfBrqwWtufBoddV3SX9JsopW rFoc6X5fyFwUM/dgPvDV/enfuWgJAfpz+A+we9AeC/DAV9jxwjfP3zo8++3mIH/rytJB 0mxCEk8o/HV28rlEfHBVRS8H7tNg5sjWz1oIFQOI1Knsuv6xN12ntuKJ1XXbvSGpFNun TAvL0j2O+tCU6KLZEIa7+tNNSzE1ffbSYBqjHuQMOTXd3vWQqT8rZrRtQsb4p+JNYKmO W+ctCwe5mdX98N8Cc7n1VeFqzuXHyjsngYdNNVy7f/k0mSTUHft+cBr08we0/e23kKFr FXLQ== X-Gm-Message-State: APf1xPAPjZF1aXzwn0WZhE49UVniz5nha8+DtoTBlK7ReLJFbSiYrWw3 lcSLvrE/RFAXngjUjhPI6ihMdQ== X-Received: by 10.200.12.138 with SMTP id n10mr4760788qti.186.1518567498826; Tue, 13 Feb 2018 16:18:18 -0800 (PST) Received: from localhost.localdomain ([181.229.225.176]) by smtp.gmail.com with ESMTPSA id x2sm8231097qkc.62.2018.02.13.16.18.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Feb 2018 16:18:18 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Feb 2018 21:18:01 -0300 Message-Id: <20180214001801.6546-2-jamrial@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180214001801.6546-1-jamrial@gmail.com> References: <20180214001801.6546-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/decode: remove ff_init_buffer_info() 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" It's a duplicate function. This reduces differences with libav. Signed-off-by: James Almer --- libavcodec/decode.c | 9 ++------- libavcodec/internal.h | 6 ------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index 56be9f6064..ea2168ad0c 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -130,7 +130,7 @@ static int extract_packet_props(AVCodecInternal *avci, const AVPacket *pkt) if (pkt) { ret = av_packet_copy_props(avci->last_pkt_props, pkt); if (!ret) - avci->last_pkt_props->size = pkt->size; // HACK: Needed for ff_init_buffer_info(). + avci->last_pkt_props->size = pkt->size; // HACK: Needed for ff_decode_frame_props(). } return ret; } @@ -1661,7 +1661,7 @@ static int add_metadata_from_side_data(const AVPacket *avpkt, AVFrame *frame) return av_packet_unpack_dictionary(side_metadata, size, frame_md); } -int ff_init_buffer_info(AVCodecContext *avctx, AVFrame *frame) +int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) { const AVPacket *pkt = avctx->internal->last_pkt_props; int i; @@ -1769,11 +1769,6 @@ FF_ENABLE_DEPRECATION_WARNINGS return 0; } -int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame) -{ - return ff_init_buffer_info(avctx, frame); -} - static void validate_avframe_allocation(AVCodecContext *avctx, AVFrame *frame) { if (avctx->codec_type == AVMEDIA_TYPE_VIDEO) { diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 16bd101284..bb92873d7b 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -235,12 +235,6 @@ int ff_match_2uint16(const uint16_t (*tab)[2], int size, int a, int b); unsigned int avpriv_toupper4(unsigned int x); -/** - * does needed setup of pkt_pts/pos and such for (re)get_buffer(); - */ -int ff_init_buffer_info(AVCodecContext *s, AVFrame *frame); - - void ff_color_frame(AVFrame *frame, const int color[4]); /**