Browse Source

swscale/yuv2rgb: make sure yuvTable is set to NULL after deallocation

ensures no stale pointers remain

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.1
Michael Niedermayer 12 years ago
parent
commit
46a723ec72
1 changed files with 1 additions and 2 deletions
  1. +1
    -2
      libswscale/yuv2rgb.c

+ 1
- 2
libswscale/yuv2rgb.c View File

@@ -773,7 +773,7 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4],
cgu = ((cgu << 16) + 0x8000) / cy; cgu = ((cgu << 16) + 0x8000) / cy;
cgv = ((cgv << 16) + 0x8000) / cy; cgv = ((cgv << 16) + 0x8000) / cy;


av_free(c->yuvTable);
av_freep(&c->yuvTable);


switch (bpp) { switch (bpp) {
case 1: case 1:
@@ -912,7 +912,6 @@ av_cold int ff_yuv2rgb_c_init_tables(SwsContext *c, const int inv_table[4],
fill_gv_table(c->table_gV, 4, cgv); fill_gv_table(c->table_gV, 4, cgv);
break; break;
default: default:
c->yuvTable = NULL;
if(!isPlanar(c->dstFormat) || bpp <= 24) if(!isPlanar(c->dstFormat) || bpp <= 24)
av_log(c, AV_LOG_ERROR, "%ibpp not supported by yuv2rgb\n", bpp); av_log(c, AV_LOG_ERROR, "%ibpp not supported by yuv2rgb\n", bpp);
return -1; return -1;


Loading…
Cancel
Save