This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit 7e7c1c0d94634543a7cc215d7c3b32235e487e25 Author: Niklas Haas <[email protected]> AuthorDate: Fri Jun 19 13:31:30 2026 +0200 Commit: Niklas Haas <[email protected]> CommitDate: Sat Jun 20 03:05:36 2026 +0200 swscale/format: nuke ff_props_equal() And merge it with the more clear ff_fmt_equal(). Signed-off-by: Niklas Haas <[email protected]> --- libswscale/format.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/libswscale/format.h b/libswscale/format.h index 36158da55a..24d53b8e80 100644 --- a/libswscale/format.h +++ b/libswscale/format.h @@ -120,10 +120,12 @@ static inline int ff_color_equal(const SwsColor *c1, const SwsColor *c2) ff_prim_equal(&c1->gamut, &c2->gamut); } -/* Tests only the static components of a colorspace, ignoring dimensions and per-frame data */ -static inline int ff_props_equal(const SwsFormat *fmt1, const SwsFormat *fmt2) +/* Tests only the static components of a colorspace, ignoring per-frame data */ +static inline int ff_fmt_equal(const SwsFormat *fmt1, const SwsFormat *fmt2) { - return fmt1->interlaced == fmt2->interlaced && + return fmt1->width == fmt2->width && + fmt1->height == fmt2->height && + fmt1->interlaced == fmt2->interlaced && fmt1->format == fmt2->format && fmt1->range == fmt2->range && fmt1->csp == fmt2->csp && @@ -131,14 +133,6 @@ static inline int ff_props_equal(const SwsFormat *fmt1, const SwsFormat *fmt2) ff_color_equal(&fmt1->color, &fmt2->color); } -/* Tests only the static components of a colorspace, ignoring per-frame data */ -static inline int ff_fmt_equal(const SwsFormat *fmt1, const SwsFormat *fmt2) -{ - return fmt1->width == fmt2->width && - fmt1->height == fmt2->height && - ff_props_equal(fmt1, fmt2); -} - static inline int ff_fmt_align(enum AVPixelFormat fmt) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(fmt); _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
