[FFmpeg-devel] [PATCH] avcodec/ass: explicitly set ScaledBorderAndShadow

Oneric oneric at oneric.de
Fri Apr 24 15:02:53 EEST 2020


On Fri, Apr 17, 2020 at 03:35:44 +0200, oneric at oneric.de wrote:
> From 74d3f6bd0189b0f4922404fccbefe95e1f01093d Mon Sep 17 00:00:00 2001
> From: Oneric <oneric at oneric.de>
> Date: Fri, 17 Apr 2020 00:38:53 +0200
> Subject: [PATCH] avcodec/ass: explicitly set ScaledBorderAndShadow
> 
> ---
>  libavcodec/ass.c                 | 1 +
>  tests/ref/fate/sub-aqtitle       | 1 +
>  tests/ref/fate/sub-cc            | 1 +
>  tests/ref/fate/sub-cc-realtime   | 1 +
>  tests/ref/fate/sub-cc-scte20     | 1 +
>  tests/ref/fate/sub-charenc       | 1 +
>  tests/ref/fate/sub-jacosub       | 1 +
>  tests/ref/fate/sub-microdvd      | 1 +
>  tests/ref/fate/sub-movtext       | 1 +
>  tests/ref/fate/sub-mpl2          | 1 +
>  tests/ref/fate/sub-mpsub         | 1 +
>  tests/ref/fate/sub-mpsub-frames  | 1 +
>  tests/ref/fate/sub-pjs           | 1 +
>  tests/ref/fate/sub-realtext      | 1 +
>  tests/ref/fate/sub-sami          | 1 +
>  tests/ref/fate/sub-sami2         | 1 +
>  tests/ref/fate/sub-scc           | 1 +
>  tests/ref/fate/sub-srt           | 1 +
>  tests/ref/fate/sub-srt-badsyntax | 1 +
>  tests/ref/fate/sub-stl           | 1 +
>  tests/ref/fate/sub-subviewer     | 1 +
>  tests/ref/fate/sub-subviewer1    | 1 +
>  tests/ref/fate/sub-vplayer       | 1 +
>  tests/ref/fate/sub-webvtt        | 1 +
>  tests/ref/fate/sub-webvtt2       | 1 +
>  25 files changed, 25 insertions(+)

The updated test samples have CRLF line endings, which `git am` doesn't seem 
to like. `git apply` and `git commit` do not care about the line endings. To 
apply the patch it's possible to use `git am --keep-cr`.

Alternatively, it is possible to add these files with `eol=crlf` to 
.gitattributes, which will allow a plain `git am` to work with these files in 
the future, but this has the drawback that git will report the whole file 
as having been rewritten (the actual file doesn't change, but git's view 
of the file does).
Also, adding `eol=crlf` only works for samples that *only* use CRLF line 
endings. Should there be mixed line endings on purpose (doesn't seem to be the 
case here) adding `eol=crlf` might mess things up.


More information about the ffmpeg-devel mailing list