[SCM] libav/experimental: Check for return value of initFilter().
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:50:37 UTC 2013
The following commit has been merged in the experimental branch:
commit 1ddb5747df964d0a0382169e9a22c471da9ff864
Author: Ramiro Polla <ramiro.polla at gmail.com>
Date: Sat Aug 29 23:06:22 2009 +0000
Check for return value of initFilter().
Originally committed as revision 29586 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index b8f3f35..60b1d4b 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -2812,14 +2812,16 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int d
(flags & SWS_CPU_CAPS_ALTIVEC) ? 8 :
1;
- initFilter(&c->hLumFilter, &c->hLumFilterPos, &c->hLumFilterSize, c->lumXInc,
+ if (initFilter(&c->hLumFilter, &c->hLumFilterPos, &c->hLumFilterSize, c->lumXInc,
srcW , dstW, filterAlign, 1<<14,
(flags&SWS_BICUBLIN) ? (flags|SWS_BICUBIC) : flags,
- srcFilter->lumH, dstFilter->lumH, c->param);
- initFilter(&c->hChrFilter, &c->hChrFilterPos, &c->hChrFilterSize, c->chrXInc,
+ srcFilter->lumH, dstFilter->lumH, c->param) < 0)
+ goto fail;
+ if (initFilter(&c->hChrFilter, &c->hChrFilterPos, &c->hChrFilterSize, c->chrXInc,
c->chrSrcW, c->chrDstW, filterAlign, 1<<14,
(flags&SWS_BICUBLIN) ? (flags|SWS_BILINEAR) : flags,
- srcFilter->chrH, dstFilter->chrH, c->param);
+ srcFilter->chrH, dstFilter->chrH, c->param) < 0)
+ goto fail;
#if defined(COMPILE_MMX2)
// can't downscale !!!
@@ -2863,14 +2865,16 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int d
(flags & SWS_CPU_CAPS_ALTIVEC) ? 8 :
1;
- initFilter(&c->vLumFilter, &c->vLumFilterPos, &c->vLumFilterSize, c->lumYInc,
+ if (initFilter(&c->vLumFilter, &c->vLumFilterPos, &c->vLumFilterSize, c->lumYInc,
srcH , dstH, filterAlign, (1<<12),
(flags&SWS_BICUBLIN) ? (flags|SWS_BICUBIC) : flags,
- srcFilter->lumV, dstFilter->lumV, c->param);
- initFilter(&c->vChrFilter, &c->vChrFilterPos, &c->vChrFilterSize, c->chrYInc,
+ srcFilter->lumV, dstFilter->lumV, c->param) < 0)
+ goto fail;
+ if (initFilter(&c->vChrFilter, &c->vChrFilterPos, &c->vChrFilterSize, c->chrYInc,
c->chrSrcH, c->chrDstH, filterAlign, (1<<12),
(flags&SWS_BICUBLIN) ? (flags|SWS_BILINEAR) : flags,
- srcFilter->chrV, dstFilter->chrV, c->param);
+ srcFilter->chrV, dstFilter->chrV, c->param) < 0)
+ goto fail;
#ifdef COMPILE_ALTIVEC
CHECKED_ALLOC(c->vYCoeffsBank, sizeof (vector signed short)*c->vLumFilterSize*c->dstH);
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list