From patchwork Mon Dec 30 12:43:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17061 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 37F6344802E for ; Mon, 30 Dec 2019 14:43:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0879F68A8F0; Mon, 30 Dec 2019 14:43:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A39CB68A622 for ; Mon, 30 Dec 2019 14:43:35 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id t2so32567149wrr.1 for ; Mon, 30 Dec 2019 04:43:35 -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:mime-version :content-transfer-encoding; bh=GeIpfUSBglOoa/hdi5dsb3CW6gnyRM5oPXtQm4ksS6Q=; b=tAS9/QQsv/vTCC6yxdvbNK0dknkdP6hNGrMoKS6rVu0boBkk3hhKC0FNNNcuNxgBaj t9okMyR+umQkugZk+gnBtX88fYXcv26n4XzWhmaQ9junN/l0hfFqNroo+DtyH7mAtVcr nfHMZE7nyiKDTyZIisw7dySApIqEWoFsEjNxTFu2XvGAp4RT4XA/a5M+qrO51F7+h2hY sMRzz9XD+1yivyaCHlgqbHP6LYJ+CnvgCTPMxaEy2DPPlgevAAhkPTdIXOmXDhWl87L+ vUevFNQoeQJwfmAWRbWSqIyWzrrHPLauKKRFFj/1gzylXsgbF23faafO+nRbdjwMUN2T 2Nfw== 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:mime-version :content-transfer-encoding; bh=GeIpfUSBglOoa/hdi5dsb3CW6gnyRM5oPXtQm4ksS6Q=; b=E4j8ABqDBL8S2GUjOAfTDSmHKo/4X/hqUSvTnI5fPWFzFrJ2if3a0Av6nLLe7XYzVA xjJZkDnKUuc4jAiY283MyMgbILNPtgVmq5fjOj5daXRWFYyjvNntx5MXlyyVBre3tCRV 8OyUwEeDQqA8qm8zKsP90vfA3r1wwtmyuEP1+9TqqqpRMkL0L3NQeI73bIfaT39dKHEy PTY8ZP6fjOfOH6h7USKqdDOFLHY+lA1qfKYY13HB7YyEkC75QIAVwbHKj4kOLEB8XBrB As9hfyzcQmse+XiYrvoEJu0CUtL3yxx3r68y4S+F/1zThsEMym38C4mXoJbmJ54myI7W VYvw== X-Gm-Message-State: APjAAAXEBWUmIrHAtyRTubfq00d9iVoTGOGVYTTZdL+1j7WUeO64roos jLUZnPh3qFeqEPTX+I97/Satl68+ X-Google-Smtp-Source: APXvYqwnebOyhMAfOGxsXiIV/oi1vzD+C1e34hl8y+FMkE6WrkPqFAMlanH+2Cvib64qZYgN9EUxeA== X-Received: by 2002:a5d:6901:: with SMTP id t1mr62307085wru.94.1577709814734; Mon, 30 Dec 2019 04:43:34 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08bbf.dynamic.kabel-deutschland.de. [188.192.139.191]) by smtp.gmail.com with ESMTPSA id c2sm45370408wrp.46.2019.12.30.04.43.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Dec 2019 04:43:34 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 Dec 2019 13:43:27 +0100 Message-Id: <20191230124327.15506-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] 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 --- As James has recently suggested that we might bump major in the coming months [1], I thought it worthwhile to ressurect my old patchset [2]; and it turned out that the second patch of this patchset does not apply cleanly any more because of e9bb1410, so here it is rebased on master. I am also open to comments regarding the other two patches. [1]: https://ffmpeg.org/pipermail/ffmpeg-devel/2019-December/254869.html [2]: https://ffmpeg.org/pipermail/ffmpeg-devel/2019-August/248674.html 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 83cad8cabe..552b3dd9df 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 $(target_path $concatfile) | tr -d '\r' > $packetfile + run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_streams -show_packets -v 0 -safe 0 $extra_args $(target_path $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 $(target_path $concatfile) + run ffprobe${PROGSUF}${EXECSUF} -bitexact -show_streams -show_packets -v 0 -of compact=p=0:nk=1 -safe 0 $extra_args $(target_path $concatfile) fi }