X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libswscale%2Futils.c;h=ef4241ac37b1c4ded8b2f894f3e5151ff02f5695;hb=04e4166536d3fb51ee9b9361de2a414fa876ab6e;hp=74f0bd321eba33ba8f3a669d506c569c781d2bb8;hpb=fea9243d53e0e281450e39ec0e1b4b3c122a8a29;p=ffmpeg diff --git a/libswscale/utils.c b/libswscale/utils.c index 74f0bd321eb..ef4241ac37b 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -228,6 +228,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_XYZ12BE] = { 1, 1, 1 }, [AV_PIX_FMT_XYZ12LE] = { 1, 1, 1 }, [AV_PIX_FMT_AYUV64LE] = { 1, 1}, + [AV_PIX_FMT_P010LE] = { 1, 0 }, + [AV_PIX_FMT_P010BE] = { 1, 0 }, }; int sws_isSupportedInput(enum AVPixelFormat pix_fmt) @@ -1356,11 +1358,11 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, (flags & SWS_FAST_BILINEAR))) c->chrSrcHSubSample = 1; - // Note the FF_CEIL_RSHIFT is so that we always round toward +inf. - c->chrSrcW = FF_CEIL_RSHIFT(srcW, c->chrSrcHSubSample); - c->chrSrcH = FF_CEIL_RSHIFT(srcH, c->chrSrcVSubSample); - c->chrDstW = FF_CEIL_RSHIFT(dstW, c->chrDstHSubSample); - c->chrDstH = FF_CEIL_RSHIFT(dstH, c->chrDstVSubSample); + // Note the AV_CEIL_RSHIFT is so that we always round toward +inf. + c->chrSrcW = AV_CEIL_RSHIFT(srcW, c->chrSrcHSubSample); + c->chrSrcH = AV_CEIL_RSHIFT(srcH, c->chrSrcVSubSample); + c->chrDstW = AV_CEIL_RSHIFT(dstW, c->chrDstHSubSample); + c->chrDstH = AV_CEIL_RSHIFT(dstH, c->chrDstVSubSample); FF_ALLOCZ_OR_GOTO(c, c->formatConvBuffer, FFALIGN(srcW*2+78, 16) * 2, fail);