Mercurial > libavcodec.hg

comparison error_resilience.c @ 11514:2a8845a2687f libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix compilation with --disable-everything --enable-decoder=mpeg2video
author aurel
date Sat, 20 Mar 2010 23:18:07 +0000
parents 6bf21de8e6eb
children 31033caa5344
comparison
equal deleted inserted replaced
11513:66da6ffd7ed5 11514:2a8845a2687f
41 static void decode_mb(MpegEncContext *s, int ref){ 41 static void decode_mb(MpegEncContext *s, int ref){
42 s->dest[0] = s->current_picture.data[0] + (s->mb_y * 16* s->linesize ) + s->mb_x * 16; 42 s->dest[0] = s->current_picture.data[0] + (s->mb_y * 16* s->linesize ) + s->mb_x * 16;
43 s->dest[1] = s->current_picture.data[1] + (s->mb_y * (16>>s->chroma_y_shift) * s->uvlinesize) + s->mb_x * (16>>s->chroma_x_shift); 43 s->dest[1] = s->current_picture.data[1] + (s->mb_y * (16>>s->chroma_y_shift) * s->uvlinesize) + s->mb_x * (16>>s->chroma_x_shift);
44 s->dest[2] = s->current_picture.data[2] + (s->mb_y * (16>>s->chroma_y_shift) * s->uvlinesize) + s->mb_x * (16>>s->chroma_x_shift); 44 s->dest[2] = s->current_picture.data[2] + (s->mb_y * (16>>s->chroma_y_shift) * s->uvlinesize) + s->mb_x * (16>>s->chroma_x_shift);
45 45
46 if(s->codec_id == CODEC_ID_H264){ 46 if(CONFIG_H264_DECODER && s->codec_id == CODEC_ID_H264){
47 H264Context *h= (void*)s; 47 H264Context *h= (void*)s;
48 h->mb_xy= s->mb_x + s->mb_y*s->mb_stride; 48 h->mb_xy= s->mb_x + s->mb_y*s->mb_stride;
49 memset(h->non_zero_count_cache, 0, sizeof(h->non_zero_count_cache)); 49 memset(h->non_zero_count_cache, 0, sizeof(h->non_zero_count_cache));
50 assert(ref>=0); 50 assert(ref>=0);
51 if(ref >= h->ref_count[0]) //FIXME it is posible albeit uncommon that slice references differ between slices, we take the easy approuch and ignore it for now. If this turns out to have any relevance in practice then correct remapping should be added 51 if(ref >= h->ref_count[0]) //FIXME it is posible albeit uncommon that slice references differ between slices, we take the easy approuch and ignore it for now. If this turns out to have any relevance in practice then correct remapping should be added