virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases Activity

swscale: added proper error check for ff_init_filters

Browse Source
This commit is contained in:
Pedro Arthur 2015-09-04 18:09:20 -03:00
parent f7361dbcf4
commit f67aff3ad7
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libswscale/slice.c
View File

@ -268,7 +268,8 @@ int ff_init_filters(SwsContext * c)
dstIdx = 1; dstIdx = 1;
if (need_lum_conv) { if (need_lum_conv) {
ff_init_desc_fmt_convert(&c->desc[index], &c->slice[srcIdx], &c->slice[dstIdx], pal); res = ff_init_desc_fmt_convert(&c->desc[index], &c->slice[srcIdx], &c->slice[dstIdx], pal);
if (res < 0) goto cleanup;
c->desc[index].alpha = c->alpPixBuf != 0; c->desc[index].alpha = c->alpPixBuf != 0;
++index; ++index;
srcIdx = dstIdx; srcIdx = dstIdx;
@ -276,7 +277,8 @@ int ff_init_filters(SwsContext * c)
dstIdx = FFMAX(num_ydesc, num_cdesc); dstIdx = FFMAX(num_ydesc, num_cdesc);
ff_init_desc_hscale(&c->desc[index], &c->slice[index], &c->slice[dstIdx], c->hLumFilter, c->hLumFilterPos, c->hLumFilterSize, c->lumXInc); res = ff_init_desc_hscale(&c->desc[index], &c->slice[srcIdx], &c->slice[dstIdx], c->hLumFilter, c->hLumFilterPos, c->hLumFilterSize, c->lumXInc);
if (res < 0) goto cleanup;
c->desc[index].alpha = c->alpPixBuf != 0; c->desc[index].alpha = c->alpPixBuf != 0;
@ -285,23 +287,26 @@ int ff_init_filters(SwsContext * c)
srcIdx = 0; srcIdx = 0;
dstIdx = 1; dstIdx = 1;
if (need_chr_conv) { if (need_chr_conv) {
ff_init_desc_cfmt_convert(&c->desc[index], &c->slice[srcIdx], &c->slice[dstIdx], pal); res = ff_init_desc_cfmt_convert(&c->desc[index], &c->slice[srcIdx], &c->slice[dstIdx], pal);
if (res < 0) goto cleanup;
++index; ++index;
srcIdx = dstIdx; srcIdx = dstIdx;
} }
dstIdx = FFMAX(num_ydesc, num_cdesc); dstIdx = FFMAX(num_ydesc, num_cdesc);
if (c->needs_hcscale) if (c->needs_hcscale)
ff_init_desc_chscale(&c->desc[index], &c->slice[srcIdx], &c->slice[dstIdx], c->hChrFilter, c->hChrFilterPos, c->hChrFilterSize, c->chrXInc); res = ff_init_desc_chscale(&c->desc[index], &c->slice[srcIdx], &c->slice[dstIdx], c->hChrFilter, c->hChrFilterPos, c->hChrFilterSize, c->chrXInc);
else else
ff_init_desc_no_chr(&c->desc[index], &c->slice[srcIdx], &c->slice[dstIdx]); res = ff_init_desc_no_chr(&c->desc[index], &c->slice[srcIdx], &c->slice[dstIdx]);
if (res < 0) goto cleanup;
} }
++index; ++index;
{ {
srcIdx = c->numSlice - 2; srcIdx = c->numSlice - 2;
dstIdx = c->numSlice - 1; dstIdx = c->numSlice - 1;
ff_init_vscale(c, c->desc + index, c->slice + srcIdx, c->slice + dstIdx); res = ff_init_vscale(c, c->desc + index, c->slice + srcIdx, c->slice + dstIdx);
if (res < 0) goto cleanup;
} }
return 0; return 0;