diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 15:43:03 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 16:35:28 +0200 |
| commit | 151aa2ebff514a9d150a2d3a7b92be1dcc46df36 (patch) | |
| tree | 866bd99edecd778aee4cd8eb5f34977d0c82a27d /libswscale/swscale.c | |
| parent | f53569a93f853057d4852601b547a1d9c57613b6 (diff) | |
| parent | 2268db2cd052674fde55c7d48b7a5098ce89b4ba (diff) | |
| download | ffmpeg-151aa2ebff514a9d150a2d3a7b92be1dcc46df36.tar.gz | |
Merge commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba'
* commit '2268db2cd052674fde55c7d48b7a5098ce89b4ba':
lavu: Drop the {minus,plus}1 suffix from AVComponentDescriptor fields
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index e9e4f622f5..b7d3d6a3a2 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -87,7 +87,7 @@ static void hScale16To19_c(SwsContext *c, int16_t *_dst, int dstW, int i; int32_t *dst = (int32_t *) _dst; const uint16_t *src = (const uint16_t *) _src; - int bits = desc->comp[0].depth_minus1; + int bits = desc->comp[0].depth - 1; int sh = bits - 4; if((isAnyRGB(c->srcFormat) || c->srcFormat==AV_PIX_FMT_PAL8) && desc->comp[0].depth_minus1<15) @@ -113,7 +113,7 @@ static void hScale16To15_c(SwsContext *c, int16_t *dst, int dstW, const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(c->srcFormat); int i; const uint16_t *src = (const uint16_t *) _src; - int sh = desc->comp[0].depth_minus1; + int sh = desc->comp[0].depth - 1; if(sh<15) sh= isAnyRGB(c->srcFormat) || c->srcFormat==AV_PIX_FMT_PAL8 ? 13 : desc->comp[0].depth_minus1; @@ -796,7 +796,7 @@ static int swscale(SwsContext *c, const uint8_t *src[], if (is16BPS(dstFormat) || isNBPS(dstFormat)) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(dstFormat); fillPlane16(dst[3], dstStride[3], length, height, lastDstY, - 1, desc->comp[3].depth_minus1, + 1, desc->comp[3].depth, isBE(dstFormat)); } else fillPlane(dst[3], dstStride[3], length, height, lastDstY, 255); |