From: "Martin Storsjö via ffmpeg-devel" <ffmpeg-devel@ffmpeg.org>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: "Martin Storsjö" <martin@martin.st>,
"Andreas Rheinhardt" <andreas.rheinhardt@outlook.com>
Subject: Re: [FFmpeg-devel] [PATCH] fate/subtitles: Ignore line endings for sub-scc test
Date: Tue, 13 Feb 2024 17:13:38 +0200 (EET)
Message-ID: <2eba50a5-ac75-ff4f-226-cbdbecd6b36e@martin.st> (raw)
In-Reply-To: <AS8P250MB074410B1ACDAD7C49F20F05D8F4F2@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM>
On Tue, 13 Feb 2024, Andreas Rheinhardt wrote:
> Since 7bf1b9b35769b37684dd2f18a54f01d852a540c8,
> the test produces ordinary \n, yet this is not what the reference
> file used for the most time, leading to test failures.
>
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
> ---
> tests/fate/subtitles.mak | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak
> index cea4c810dd..90412e9ac1 100644
> --- a/tests/fate/subtitles.mak
> +++ b/tests/fate/subtitles.mak
> @@ -114,6 +114,7 @@ fate-sub-charenc: CMD = fmtstdout ass -sub_charenc cp1251 -i $(TARGET_SAMPLES)/s
>
> FATE_SUBTITLES-$(call DEMDEC, SCC, CCAPTION) += fate-sub-scc
> fate-sub-scc: CMD = fmtstdout ass -ss 57 -i $(TARGET_SAMPLES)/sub/witch.scc
> +fate-sub-scc: CMP = diff
>
> FATE_SUBTITLES-$(call DEMMUX, SCC, SCC) += fate-sub-scc-remux
> fate-sub-scc-remux: CMD = fmtstdout scc -i $(TARGET_SAMPLES)/sub/witch.scc -ss 4:00 -map 0 -c copy
> --
> 2.34.1
Looks ok to me, as a temporary measure until we figure out the best way to
upgrade everybody's workdirs without needing interaction. (As an added
note to the other thread; even if we could easily patch fate.sh, every
current user's workdir is also prone to this issue, and the way of fixing
it is kinda non-obvious.)
// Martin
_______________________________________________
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".
prev parent reply other threads:[~2024-02-13 15:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-13 13:22 Andreas Rheinhardt
2024-02-13 15:13 ` Martin Storsjö via ffmpeg-devel [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2eba50a5-ac75-ff4f-226-cbdbecd6b36e@martin.st \
--to=ffmpeg-devel@ffmpeg.org \
--cc=andreas.rheinhardt@outlook.com \
--cc=martin@martin.st \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git