From patchwork Wed Mar 22 21:26:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 3066 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp503232vsy; Wed, 22 Mar 2017 14:26:42 -0700 (PDT) X-Received: by 10.28.46.198 with SMTP id u189mr9501273wmu.54.1490218002001; Wed, 22 Mar 2017 14:26:42 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u4si22237656wmu.106.2017.03.22.14.26.40; Wed, 22 Mar 2017 14:26:41 -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=@jkqxz-net.20150623.gappssmtp.com; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BCF2B6891F3; Wed, 22 Mar 2017 23:26:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f177.google.com (mail-wr0-f177.google.com [209.85.128.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 644A0680CA2 for ; Wed, 22 Mar 2017 23:26:12 +0200 (EET) Received: by mail-wr0-f177.google.com with SMTP id u1so1946077wra.2 for ; Wed, 22 Mar 2017 14:26:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=to:from:subject:message-id:date:user-agent:mime-version :content-transfer-encoding; bh=PPLxL5eqoP/+fX3fA5cmFGW3kSQ1AdFm11pIjr113mM=; b=vce3Qh1pD34DhCVUCoIzEH3rVhyqw9JqLBSxjlnC8G9XygxBhS4sHyIVGTLAptGw/c mm2G6iLNAqxKGSmmK+azOJgKaYsobXRqpYIJzorVyKIBT/Mc78TPukwYIxL+d2rbqbn9 dFweiHBX5RZt8gxlw0FIdK68TAsly1SEA5ruhUIdAHQ26YZs2k50eTtj3Q1HSpcR+HQW FAUoZ/EGA9FmJ4qF0FjAxqGMEyhmVp9ML/iSFBsOCjEpp9eQrvXIiL2VtnXPxwIo/JX3 k1P1QobhxaEaWtorjdWgVjWy1pGPttwziSg7J84Wel1+ldb271TVv3J3yHp+8qSAc4N6 G9vQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-transfer-encoding; bh=PPLxL5eqoP/+fX3fA5cmFGW3kSQ1AdFm11pIjr113mM=; b=ul0IKxp5P4Xq6xnHNkuN8FLEYoyrA1gMskWRdwo3dR0KCz6JEsdKGgBm+hmOXp29Cb 0Gia0hCUVVj2MnvDMhBYDu5nfDwTZtMAYvtrGrdbdt/U6LIi/OJC92dPJvAxEmFIquGf EYrofpbndkNGUD2HGk6kZ6564OZpMhqdDJ8mWrR8eQJhLwyMTUV0/j4W8uH3CUP6zY9V 43JtZZwOkyZPNaevmTU0I1nOj5F+1u8qIH4giIFlAJOX1ZXi/kl3+kzI9NGL/x23ndI0 SyWUXHrW4YDnJc9no/fL9tOe4Xih2RXgf2j0d7MYaqWGijb6ftCnF9RHkRGxpiqfCKCM 3d7w== X-Gm-Message-State: AFeK/H1nR1ZUBHfArAWNrAG87wh14li3/KJfBFct8jf/aq+xQVTL4dOMUBftgFbSzmxSzQ== X-Received: by 10.223.175.51 with SMTP id z48mr4685900wrc.3.1490217990748; Wed, 22 Mar 2017 14:26:30 -0700 (PDT) Received: from [192.168.0.8] (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id w4sm1767939wmg.29.2017.03.22.14.26.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Mar 2017 14:26:30 -0700 (PDT) To: FFmpeg development discussions and patches From: Mark Thompson Message-ID: <0d5b5128-fefc-6dac-04dc-07fac405c49a@jkqxz.net> Date: Wed, 22 Mar 2017 21:26:27 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.6.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] ffmpeg: Remove hw_device_ctx output filter reinit hack 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" This was skipped in c17563c5d3c974a69709ebae0171534763b3051c because it depended on the filter setup merge, but was forgotten after that actually happened. Fixes hwaccel fate for stream size change tests. --- ffmpeg_filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 5cc640d75d..219e473f69 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -460,7 +460,7 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, if (ret < 0) return ret; - if (!hw_device_ctx && (ofilter->width || ofilter->height)) { + if (ofilter->width || ofilter->height) { char args[255]; AVFilterContext *filter; AVDictionaryEntry *e = NULL;