From 1710856cb1a4dc1832826ad74e1a8843354ed7ac Mon Sep 17 00:00:00 2001 From: Andreas Öman Date: Thu, 31 Jan 2008 00:15:24 +0000 Subject: 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 ^ Originally committed as revision 11680 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 9d0e4a1d46..a0a03cb5af 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2090,8 +2090,6 @@ static void clone_tables(H264Context *dst, H264Context *src){ * 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 @@ static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){ 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); } } } -- cgit v1.2.3