From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id C80BF466EE for ; Wed, 2 Aug 2023 07:02:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 704E868C5A3; Wed, 2 Aug 2023 10:02:28 +0300 (EEST) Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F191B68BABF for ; Wed, 2 Aug 2023 10:02:22 +0300 (EEST) Received: by mail-lf1-f53.google.com with SMTP id 2adb3069b0e04-4fe0c566788so10785336e87.0 for ; Wed, 02 Aug 2023 00:02:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20221208.gappssmtp.com; s=20221208; t=1690959742; x=1691564542; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=fqY39bTGQ2wCp7PNKAhp4qX91CXJ4weTwkacIgDZ8/o=; b=KDXuLqyPNcbzN+3/7IrWf9rdtDScAaBbjwaGEdcHIKilWVDm4DGMKvHOzqT+Uo5CVp kYDKB5UDhO7d0otZ/wD+iehBKkJm8rvPHuuSGlo7cMxmQtiGPTk9sIFSlXTwMz/vZVkq v2XOmbXVrQbj0eboy0VA0dJ07GdHsEkjzS9lVvOH90P4W3rCGZXdgpGJlOB3nobVu/Im x+IMEEOFNibOVMQA3dQdZTp7TQR745UO0dDRJqvL3VesvvG6HfUuemURLoOJREvi/O4X UdfuOGHtTCmo626ShyS4R4D2Y8xwlbxG9nzwPQc0wxv4P48hL+0z0Mc62fMz1Ec0pGLL tZzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690959742; x=1691564542; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fqY39bTGQ2wCp7PNKAhp4qX91CXJ4weTwkacIgDZ8/o=; b=ICanjlCza13JPg2gw3NzelPu4oO81u4OP/24p6cIAGel+92UjX0GeQqIiDIscPTGuK g5dI/JFBVH8Vf5WVLsd5Z60HybyAW0Vv6siqCXDFWitjHlQcgi5MMkBhfN56Bn4ZEjhb TVP7HP3iSZkYo7AhVz0uNvl6T3HkkzgHpAnwgSto6c/K4hbzGKwSskXra9pnuyTlwbVm 5rYfFp8ro45O5ceAo+My8PQrvXDW8OEhJJnHk1Fw4li1o3eRFWGbOXiXrlBq3+Uwg5/t yfL1taxJJSmeL6qG0fKo1F6Xd35M/F333pNRtE4s0roHjnVBUUfsUFRbqSj5yyfVMP7x rFIQ== X-Gm-Message-State: ABy/qLanRQnypKyhTSvW2vapy7qtB7x6LIiXCuy1y5i8fTf+Gsw5R4e3 vVhX2zXiII99Z2grcdpQvMAdUIMH3/X6fk8Qi//ITw== X-Google-Smtp-Source: APBJJlHti7is/RuxsAuc8uTBPT+xU1yflut3piaYRuHjUzE1JLU6vvFXvhdWpxN8uKG5HFIkeUN1/w== X-Received: by 2002:a05:6512:3ba3:b0:4fe:1d71:6076 with SMTP id g35-20020a0565123ba300b004fe1d716076mr5099066lfv.46.1690959742149; Wed, 02 Aug 2023 00:02:22 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id o12-20020a05651238ac00b004fe0c3d8bb4sm2821578lft.84.2023.08.02.00.02.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Aug 2023 00:02:21 -0700 (PDT) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Aug 2023 10:02:21 +0300 Message-Id: <20230802070221.29433-1-martin@martin.st> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] tests: Correctly distinguish between SAMPLES and TARGET_SAMPLES for hls_fmp4_ac3.m3u8 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This fixes the test when running in a cross test setup where the samples are located at a different path between build host and temote test target. --- tests/fate/hlsenc.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate/hlsenc.mak b/tests/fate/hlsenc.mak index 7df74f1f63..8118d5b925 100644 --- a/tests/fate/hlsenc.mak +++ b/tests/fate/hlsenc.mak @@ -100,7 +100,7 @@ fate-hls-fmp4: CMD = framecrc -auto_conversion_filters -flags +bitexact -i $(TAR tests/data/hls_fmp4_ac3.m3u8: TAG = GEN tests/data/hls_fmp4_ac3.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< -nostdin \ - -stream_loop 4 -i $(SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 -c copy -map 0 \ + -stream_loop 4 -i $(TARGET_SAMPLES)/ac3/monsters_inc_5.1_448_small.ac3 -c copy -map 0 \ -hls_segment_type fmp4 -hls_fmp4_init_filename now_ac3.mp4 -hls_list_size 0 \ -hls_time 2 -hls_segment_filename "$(TARGET_PATH)/tests/data/hls_fmp4_ac3_%d.m4s" \ $(TARGET_PATH)/tests/data/hls_fmp4_ac3.m3u8 2>/dev/null -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".