From patchwork Wed May 17 10:20:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41669 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1078739pzb; Wed, 17 May 2023 03:22:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ59MNgl743pdO15POZ4Tq2iYvib6KCWmwx+KWABJ3uBq8cdvF2JK+QUlBMHSa4Mq3+o29Qu X-Received: by 2002:a17:907:3606:b0:961:800b:3f57 with SMTP id bk6-20020a170907360600b00961800b3f57mr35936244ejc.77.1684318970603; Wed, 17 May 2023 03:22:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684318970; cv=none; d=google.com; s=arc-20160816; b=Ptbn9Wthn2lU1bLwUjm4oDyDq/TKMatGXsZFQQv47447SdVNJn4MFilOqevZpldpHG zlSOsOvanXzWD+KQuJsAgTp9/63K2GWtiiFhnKNe2YTzVf/5oYf6/IPRHOpoXhSB1NqP 25Ihf9MhmxJ1RYBD6lG0pM0zopqU2EDZZfPRT2yn5yCR6lFV10nVAsXzyr6PKT+J6R3L Z4gYCPaG1hmZ7zEIpIrFdh+opc3fNVlAcBMhE63BIAbH03gCc2BJ/iB5PRZw5NGSuARr QpoPjnMzbheq5dT6CpPxPzY58sg0SD2GbZ6SOkyQaCJmzWRtsZDKH+n3KWehWeJnCJz0 7CKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=HPkNYegtPKyYqchSSLBaOvtG7pJm5LThDzL3vLN10no=; b=rDY5M0TbNzVKyh3tnUYAqk56XdZXvVzJRMrt6LBrgjDSGcEugTkjp6Ha8BE/BV9fSb XmUkmBCV903F6u0fjs7xDLGODxJKDRMwSCmcWxxH2FGx7jpbg6ZhHmAxXosYWefxR4Ye Tb9t7HyPpfownRdejVkSqiWsOK6Ki/rZGP+Za+UxRDsFWXLsCvD5/vuUsl3YraUF3YJD c29PBhmQEdUIZwAZ3Z8yas0D/y6ZX4Qcl1SjAMI1KIqqKAxur0A+/ybvtMdheTe/FNDx +PRDgU+2lKlxI149foL/VG73K7DAfMyiMm78nADHzigLJjGBVj/KMaXtCZ52m11dgiTy b3rQ== ARC-Authentication-Results: i=1; mx.google.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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id jw19-20020a17090776b300b009591dd6c71esi15838430ejc.896.2023.05.17.03.22.50; Wed, 17 May 2023 03:22:50 -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; 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 BEE3768C168; Wed, 17 May 2023 13:21:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 76B3B68C13C for ; Wed, 17 May 2023 13:20:52 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id E19772405EC for ; Wed, 17 May 2023 12:20:50 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id vnhINEK7hZ2i for ; Wed, 17 May 2023 12:20:50 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 06A412406CB for ; Wed, 17 May 2023 12:20:46 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id A60AB3A1506 for ; Wed, 17 May 2023 12:20:39 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 May 2023 12:20:00 +0200 Message-Id: <20230517102029.541-7-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230517102029.541-1-anton@khirnov.net> References: <20230517102029.541-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/36] tests/fate/ffmpeg: move a misplaced line X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: Rms+NjwYDrsb --- tests/fate/ffmpeg.mak | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index 0f33c2a0ed..892624e523 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -190,6 +190,7 @@ fate-copy-shortest1: CMD = framemd5 -auto_conversion_filters -fflags +bitexact - fate-copy-shortest2: CMD = framemd5 -auto_conversion_filters -fflags +bitexact -flags +bitexact -f lavfi -i "sine=3000:d=10" -i $(TARGET_PATH)/tests/data/audio_shorter_than_video.nut -filter_complex "[0:a:0][1:a:0]amix=inputs=2[audio]" -map 1:v:0 -map "[audio]" -fflags +bitexact -flags +bitexact -c:v copy -c:a ac3_fixed -shortest fate-streamcopy: $(FATE_STREAMCOPY-yes) +FATE_SAMPLES_FFMPEG-yes += $(FATE_STREAMCOPY-yes) FATE_SAMPLES_FFMPEG-$(call TRANSCODE, RAWVIDEO, MATROSKA, MOV_DEMUXER QTRLE_DECODER) += fate-rgb24-mkv fate-rgb24-mkv: CMD = transcode "mov" $(TARGET_SAMPLES)/qtrle/aletrek-rle.mov\ @@ -218,8 +219,6 @@ fate-ffmpeg-bsf-remove-e: CMD = transcode "mpeg" $(TARGET_SAMPLES)/mpeg2/matrixb FATE_SAMPLES_FFMPEG-$(call DEMMUX, APNG, FRAMECRC, SETTS_BSF PIPE_PROTOCOL) += fate-ffmpeg-setts-bsf fate-ffmpeg-setts-bsf: CMD = framecrc -i $(TARGET_SAMPLES)/apng/clock.png -c:v copy -bsf:v "setts=duration=if(eq(NEXT_PTS\,NOPTS)\,PREV_OUTDURATION\,(NEXT_PTS-PTS)/2):ts=PTS/2" -fflags +bitexact -FATE_SAMPLES_FFMPEG-yes += $(FATE_STREAMCOPY-yes) - FATE_TIME_BASE-$(call PARSERDEMDEC, MPEGVIDEO, MPEGPS, MPEG2VIDEO, MPEGVIDEO_DEMUXER MXF_MUXER) += fate-time_base fate-time_base: CMD = md5 -i $(TARGET_SAMPLES)/mpeg2/dvd_single_frame.vob -an -sn -c:v copy -r 25 -time_base 1001:30000 -fflags +bitexact -f mxf