From patchwork Sun Nov 11 15:32:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10981 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 03D4C44D53F for ; Sun, 11 Nov 2018 17:38:12 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 68D23689BC6; Sun, 11 Nov 2018 17:37:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48129689A30 for ; Sun, 11 Nov 2018 17:37:37 +0200 (EET) Received: by mail-ed1-f65.google.com with SMTP id n19-v6so5381174edq.11 for ; Sun, 11 Nov 2018 07:38:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=yO1Ca2kuZ6i1KwXtt23386keKa0JBYLMW/h9akGsy98=; b=jtJ+UjGT82oSr2/cUh/aLT5d4zDFhA/UWN5nTtUg59vHBEiG1Hzgc8XVbSUNNwP061 I3k/Z5lShm/TPtmCHtWACpXMvwzoxpNkeCFj95kB4dkaeHQJXSnkBIiFih0zzpp/v+wj axdGAK5gyir3GJaFUVmOvEis9YL/X7mx2ZsNOjqBM9ndmQ3xPJudJ915GQF8RZ6lBO0I BrgGGAzcUM4+qphOFKcTUA5V0zOFBsYpw1gSGTN2Tba4Cqlc20hekEXjNANczP6PIl1E wBS+DzaAhLYOcxE7HGNcdw+7V63SAF2+r3xW461Mh/XgAX+e2pqQ1T4k7SpptcqoFXM+ K5AA== 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:mime-version:content-transfer-encoding; bh=yO1Ca2kuZ6i1KwXtt23386keKa0JBYLMW/h9akGsy98=; b=TruiSl4hXwvvom48vorTDRcIWN2GKLDvB0FtbGNMKWrBh5SDpnwZGI+RfomeI/WT3b OlDoozZ1gOpFzDJKS3kAhWqX/gOwzq6MkIG8qYlkS48W+b5fYnIe+PGFmBicebE7dieG 1JiKde42irtD3Cu3VF/lOWSFWp5uqZr6uMAoq2M8tFdMtjNC32+tDi3JzJRzT2nFM6xh 2RqlyNq0MLZLxdsLKBeF9dsKpt1CE+UuPzW1PlYehrNyy1pJtTvGRPyQtnpPRhHAporO TVu8FHfOqgqpwxK3it5V6kw5C8HWbHU9jjrg8CabuFo55ZkggioN72TNn9L2bg5wZnh4 CuSQ== X-Gm-Message-State: AGRZ1gKRU+9rve69fXENIGuh9xRq4/0s4l4jPxfMdvNRMWMEevDfSDmJ 1865Hl6k6hsd5n4G4AcBTIhki31NWbc= X-Google-Smtp-Source: AJdET5dCM8RyrnU39ACFdwoQmr0UGbpu3Y2nETHfLfe5NERKGtbOb5WmGlmJSzZRhLC3STJqlPjldQ== X-Received: by 2002:a50:f396:: with SMTP id g22-v6mr9769434edm.110.1541950340464; Sun, 11 Nov 2018 07:32:20 -0800 (PST) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id c23-v6sm846233ejb.62.2018.11.11.07.32.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Nov 2018 07:32:19 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Nov 2018 15:32:14 +0000 Message-Id: <20181111153215.9287-2-sw@jkqxz.net> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181111153215.9287-1-sw@jkqxz.net> References: <20181111153215.9287-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] ffmpeg: Remove get_buffer override 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" Since nothing sets hwaccel_get_buffer any more, this is always equivalent to the default case. --- fftools/ffmpeg.c | 11 ----------- fftools/ffmpeg.h | 1 - 2 files changed, 12 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 38c21e944a..e0ffd1b779 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2875,16 +2875,6 @@ static enum AVPixelFormat get_format(AVCodecContext *s, const enum AVPixelFormat return *p; } -static int get_buffer(AVCodecContext *s, AVFrame *frame, int flags) -{ - InputStream *ist = s->opaque; - - if (ist->hwaccel_get_buffer && frame->format == ist->hwaccel_pix_fmt) - return ist->hwaccel_get_buffer(s, frame, flags); - - return avcodec_default_get_buffer2(s, frame, flags); -} - static int init_input_stream(int ist_index, char *error, int error_len) { int ret; @@ -2900,7 +2890,6 @@ static int init_input_stream(int ist_index, char *error, int error_len) ist->dec_ctx->opaque = ist; ist->dec_ctx->get_format = get_format; - ist->dec_ctx->get_buffer2 = get_buffer; ist->dec_ctx->thread_safe_callbacks = 1; av_opt_set_int(ist->dec_ctx, "refcounted_frames", 1, 0); diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index eb1eaf6363..ae406aae2f 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -369,7 +369,6 @@ typedef struct InputStream { /* hwaccel context */ void *hwaccel_ctx; void (*hwaccel_uninit)(AVCodecContext *s); - int (*hwaccel_get_buffer)(AVCodecContext *s, AVFrame *frame, int flags); int (*hwaccel_retrieve_data)(AVCodecContext *s, AVFrame *frame); enum AVPixelFormat hwaccel_pix_fmt; enum AVPixelFormat hwaccel_retrieved_pix_fmt;