diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2008-09-16 03:49:54 +0000 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-16 03:49:54 +0000 |
commit | d616c8ae3dcce2e00b69d9b31f52aaa6b68ce19c (patch) | |
tree | e8a087b8b2fbf13ef235b9e48ed5bf3b0d6f1b58 | |
parent | 1d4113d0532ff01f9db5964333eb1a3997d9fb86 (diff) | |
download | ffmpeg-d616c8ae3dcce2e00b69d9b31f52aaa6b68ce19c.tar.gz |
Fix segfault with rgb24 and full_internal_chrome due to non existing alpha
byte being written after the array.
Originally committed as revision 27628 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
-rw-r--r-- | libswscale/swscale.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 56a349c811..a7c42c8371 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -905,29 +905,34 @@ static inline void yuv2rgbXinC_full(SwsContext *c, int16_t *lumFilter, int16_t * { int i; int step= fmt_depth(c->dstFormat)/8; + int aidx= 3; switch(c->dstFormat){ case PIX_FMT_ARGB: dest++; + aidx= 0; case PIX_FMT_RGB24: + aidx--; case PIX_FMT_RGBA: YSCALE_YUV_2_RGBX_FULL_C(1<<21) + dest[aidx]= 0; dest[0]= R>>22; dest[1]= G>>22; dest[2]= B>>22; - dest[3]= 0; dest+= step; } break; case PIX_FMT_ABGR: dest++; + aidx= 0; case PIX_FMT_BGR24: + aidx--; case PIX_FMT_BGRA: YSCALE_YUV_2_RGBX_FULL_C(1<<21) + dest[aidx]= 0; dest[0]= B>>22; dest[1]= G>>22; dest[2]= R>>22; - dest[3]= 0; dest+= step; } break; |