diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 17:10:48 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-08 17:10:48 +0200 |
| commit | 5d8e836d0ec3bcaabf5bc2020210a1bc61975922 (patch) | |
| tree | 8ff87745055d571431ded709218556357b18341c /libswscale/swscale.c | |
| parent | 151aa2ebff514a9d150a2d3a7b92be1dcc46df36 (diff) | |
| download | ffmpeg-5d8e836d0ec3bcaabf5bc2020210a1bc61975922.tar.gz | |
Replace all remaining occurances of step/depth_minus1 and offset_plus1
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index b7d3d6a3a2..8d71abbbbc 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -90,7 +90,7 @@ static void hScale16To19_c(SwsContext *c, int16_t *_dst, int dstW, 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) + if((isAnyRGB(c->srcFormat) || c->srcFormat==AV_PIX_FMT_PAL8) && desc->comp[0].depth<16) sh= 9; for (i = 0; i < dstW; i++) { @@ -116,7 +116,7 @@ static void hScale16To15_c(SwsContext *c, int16_t *dst, int dstW, 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; + sh= isAnyRGB(c->srcFormat) || c->srcFormat==AV_PIX_FMT_PAL8 ? 13 : (desc->comp[0].depth - 1); for (i = 0; i < dstW; i++) { int j; |