Mercurial > libavcodec.hg
diff h264.c @ 6203:c9433472cb95 libavcodec
Fix the following warnings:
h264.c:2093: warning: unused variable 's'
h264.c:2406: warning: suggest parentheses around arithmetic in operand of ^
h264.c:2412: warning: suggest parentheses around arithmetic in operand of ^
author | andoma |
---|---|
date | Thu, 31 Jan 2008 00:15:24 +0000 |
parents | 52ccab2531bd |
children | b26ccd688817 |
line wrap: on
line diff
--- a/h264.c Thu Jan 31 00:10:56 2008 +0000 +++ b/h264.c Thu Jan 31 00:15:24 2008 +0000 @@ -2090,8 +2090,6 @@ * Allocate buffers which are not shared amongst multiple threads. */ static int context_init(H264Context *h){ - MpegEncContext * const s = &h->s; - CHECKED_ALLOCZ(h->top_borders[0], h->s.mb_width * (16+8+8) * sizeof(uint8_t)) CHECKED_ALLOCZ(h->top_borders[1], h->s.mb_width * (16+8+8) * sizeof(uint8_t)) @@ -2403,13 +2401,13 @@ continue; if(IS_16X16(mb_type)){ int8_t *ref = &h->ref_cache[list][scan8[0]]; - fill_rectangle(ref, 4, 4, 8, 16+*ref^(s->mb_y&1), 1); + fill_rectangle(ref, 4, 4, 8, (16+*ref)^(s->mb_y&1), 1); }else{ for(i=0; i<16; i+=4){ //FIXME can refs be smaller than 8x8 when !direct_8x8_inference ? int ref = h->ref_cache[list][scan8[i]]; if(ref >= 0) - fill_rectangle(&h->ref_cache[list][scan8[i]], 2, 2, 8, 16+ref^(s->mb_y&1), 1); + fill_rectangle(&h->ref_cache[list][scan8[i]], 2, 2, 8, (16+ref)^(s->mb_y&1), 1); } } }