From patchwork Wed Aug 21 09:04:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 14637 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 9DC41447EBB for ; Wed, 21 Aug 2019 12:14:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 85C5968AB78; Wed, 21 Aug 2019 12:14:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6002968023F for ; Wed, 21 Aug 2019 12:14:12 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id k2so1312157wrq.2 for ; Wed, 21 Aug 2019 02:14:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kM3zmlZyjSWUp8jRP/cKYPdvZ7T5lrqmoL97tS8Dzps=; b=SNGjMH8WHVAo1fTmS0cKQDgiYbfGIXpr+tzHN3GGgK6ufpNk77Nu1DPK/OH7POzhWz z315QGyCPthF3i/2ou/lPS49WbaYqghRVvMh679lMtbhAKrUbo4z2zT81NRsFVmvsXQ/ cpXpkthqjKRL7C+bMUa/Pl7lRMbK/zJ0H757ALG4pdYZ0vAnyNT34UBeGr9cZOWwg7QW lXd4RvvzqTuNR0mYSA5akVI3mTbR2iGmwGnVzwvQkfHKx1aw9HQN27OxSHQa+uAoJjx/ bF/F9X65vgIEHs98k+zzkuypx85lE3uL7iGLQ4Hk9nulKj35IptgVh8UtiTaIbvvDEQm 4XhA== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=kM3zmlZyjSWUp8jRP/cKYPdvZ7T5lrqmoL97tS8Dzps=; b=HOpgdS7GM5IpyCa1TaNJ1+rkE4wDBGDQuZVxmD8lg1P+bCy76czCJuqfBgHHnDo74e KJ6fbwOLxj9isEj/jasyqjoms4U2SQQyW03f7UZYLjz0wPo+1ycaCo6j6JZnKSIg9NNN C9EOaTf08NPM16ToPimY1x9MsQze0e7Cz5qGxp7aY1lFGsNGbHIOysqnEXd3NzBh5q9L g/8ebGKL5Hacsve/fKIcf0F2akkypJyRb+x/OZYbNakr6oST1hnfuo+qdZRj4Rh3W318 DGn8621m6ryeHyhlWz4S0eiNPHpc558zV2axgZCFZb2Q0F12RxaIQGhGWoOIrXn9Ffy5 jcmw== X-Gm-Message-State: APjAAAVGH/wQrqvNWplkt8xQaxC4eBkBxcWnv11V0KZtAUlm5FHweS07 Ll+mcFisTEVcYnka3AJtH4WxLIFfSPfN37/v X-Google-Smtp-Source: APXvYqzW/i4XXE2G0ikAhO6q8oOwg5K/1ZFbvxmRpRmDynn3oStRIe9dhNM2wX3ZrKsoWhpwnejJWw== X-Received: by 2002:adf:de02:: with SMTP id b2mr39666069wrm.204.1566378851762; Wed, 21 Aug 2019 02:14:11 -0700 (PDT) Received: from localhost.localdomain (ipbcc0f857.dynamic.kabel-deutschland.de. [188.192.248.87]) by smtp.gmail.com with ESMTPSA id o14sm37173171wrg.64.2019.08.21.02.14.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Aug 2019 02:14:11 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Aug 2019 11:04:37 +0200 Message-Id: <20190821090438.10260-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190821090438.10260-1-andreas.rheinhardt@gmail.com> References: <20190821090438.10260-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] fate: Don't use depreceated keepside option 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The tests for concat use this option which is scheduled for removal and does nothing any more. So remove it; otherwise, these tests would fail at the next major version bump. Signed-off-by: Andreas Rheinhardt --- tests/fate-run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 2f1991da52..09f80ffdc2 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -471,10 +471,10 @@ concat(){ awk "{gsub(/%SRCFILE%/, \"$sample\"); print}" $template > $concatfile if [ "$mode" = "md5" ]; then - run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_streams -show_packets -v 0 -fflags keepside -safe 0 $extra_args $concatfile | tr -d '\r' > $packetfile + run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_streams -show_packets -v 0 -safe 0 $extra_args $concatfile | tr -d '\r' > $packetfile do_md5sum $packetfile else - run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_streams -show_packets -v 0 -of compact=p=0:nk=1 -fflags keepside -safe 0 $extra_args $concatfile + run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_streams -show_packets -v 0 -of compact=p=0:nk=1 -safe 0 $extra_args $concatfile fi }