har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle raw blocks correctly (both updating pointer and storing to memory)

Browse Source 
Originally committed as revision 6172 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov 2006-09-05 07:29:26 +00:00
parent eb57c88973
commit c0d6fc1f73
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/vmnc.c
View File

@ -105,7 +105,17 @@ static always_inline void paint_raw(uint8_t *dst, int w, int h, uint8_t* src, in
for(i = 0; i < w; i++) { for(i = 0; i < w; i++) {
p = vmnc_get_pixel(src, bpp, be); p = vmnc_get_pixel(src, bpp, be);
src += bpp; src += bpp;
memcpy(dst + i*bpp, &p, bpp); switch(bpp){
case 1:
dst[i] = p;
break;
case 2:
((uint16_t*)dst)[i] = p;
break;
case 4:
((uint32_t*)dst)[i] = p;
break;
}
} }
dst += stride; dst += stride;
} }
@ -129,6 +139,7 @@ static int decode_hextile(VmncContext *c, uint8_t* dst, uint8_t* src, int w, int
flags = *src++; flags = *src++;
if(flags & HT_RAW) { if(flags & HT_RAW) {
paint_raw(dst2, bw, bh, src, bpp, c->bigendian, stride); paint_raw(dst2, bw, bh, src, bpp, c->bigendian, stride);
src += bw * bh * bpp;
} else { } else {
if(flags & HT_BKG) { if(flags & HT_BKG) {
bg = vmnc_get_pixel(src, bpp, c->bigendian); src += bpp; bg = vmnc_get_pixel(src, bpp, c->bigendian); src += bpp;