diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-09-14 00:32:18 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-09-14 00:32:18 +0200 |
| commit | d06c5b44ccb4209b6d6839dfabf0045e934444fe (patch) | |
| tree | 0fa6cec406e25003ba178430bd9399d7e65c0fcc /libswscale/swscale.c | |
| parent | 1eb8014b492705533a8e18b08e74ee6ac63ba44f (diff) | |
| download | ffmpeg-d06c5b44ccb4209b6d6839dfabf0045e934444fe.tar.gz | |
swscale: drop redundant code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale.c')
| -rw-r--r-- | libswscale/swscale.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index d54ba3f7cf..2f70d8ca35 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -2211,10 +2211,7 @@ static av_always_inline void hyscale(SwsContext *c, int16_t *dst, int dstWidth, src= formatConvBuffer; } - if (c->hScale16) { - int shift= isAnyRGB(c->srcFormat) || c->srcFormat==PIX_FMT_PAL8 ? 13 : av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1; - c->hScale16(dst, dstWidth, (const uint16_t*)src, srcW, xInc, hLumFilter, hLumFilterPos, hLumFilterSize, shift); - } else if (!c->hyscale_fast) { + if (!c->hyscale_fast) { c->hyScale(c, dst, dstWidth, src, hLumFilter, hLumFilterPos, hLumFilterSize); } else { // fast bilinear upscale / crap downscale c->hyscale_fast(c, dst, dstWidth, src, srcW, xInc); @@ -2256,11 +2253,7 @@ static av_always_inline void hcscale(SwsContext *c, int16_t *dst1, int16_t *dst2 src2= buf2; } - if (c->hScale16) { - int shift= isAnyRGB(c->srcFormat) || c->srcFormat==PIX_FMT_PAL8 ? 13 : av_pix_fmt_descriptors[c->srcFormat].comp[0].depth_minus1; - c->hScale16(dst1, dstWidth, (const uint16_t*)src1, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize, shift); - c->hScale16(dst2, dstWidth, (const uint16_t*)src2, srcW, xInc, hChrFilter, hChrFilterPos, hChrFilterSize, shift); - } else if (!c->hcscale_fast) { + if (!c->hcscale_fast) { c->hcScale(c, dst1, dstWidth, src1, hChrFilter, hChrFilterPos, hChrFilterSize); c->hcScale(c, dst2, dstWidth, src2, hChrFilter, hChrFilterPos, hChrFilterSize); } else { // fast bilinear upscale / crap downscale |