Mercurial > libavcodec.hg
diff h264.c @ 8646:8b52ac19a91c libavcodec
remove zigzag_scan8x8, it is the same as ff_zigzag_direct
author | stefang |
---|---|
date | Sat, 24 Jan 2009 14:30:15 +0000 |
parents | d6bab465b82c |
children | 5cf9f2f663b0 |
line wrap: on
line diff
--- a/h264.c Sat Jan 24 14:28:08 2009 +0000 +++ b/h264.c Sat Jan 24 14:30:15 2009 +0000 @@ -3563,14 +3563,14 @@ } } if(s->dsp.h264_idct8_add == ff_h264_idct8_add_c){ - memcpy(h->zigzag_scan8x8, zigzag_scan8x8, 64*sizeof(uint8_t)); + memcpy(h->zigzag_scan8x8, ff_zigzag_direct, 64*sizeof(uint8_t)); memcpy(h->zigzag_scan8x8_cavlc, zigzag_scan8x8_cavlc, 64*sizeof(uint8_t)); memcpy(h->field_scan8x8, field_scan8x8, 64*sizeof(uint8_t)); memcpy(h->field_scan8x8_cavlc, field_scan8x8_cavlc, 64*sizeof(uint8_t)); }else{ for(i=0; i<64; i++){ #define T(x) (x>>3) | ((x&7)<<3) - h->zigzag_scan8x8[i] = T(zigzag_scan8x8[i]); + h->zigzag_scan8x8[i] = T(ff_zigzag_direct[i]); h->zigzag_scan8x8_cavlc[i] = T(zigzag_scan8x8_cavlc[i]); h->field_scan8x8[i] = T(field_scan8x8[i]); h->field_scan8x8_cavlc[i] = T(field_scan8x8_cavlc[i]); @@ -3579,7 +3579,7 @@ } if(h->sps.transform_bypass){ //FIXME same ugly h->zigzag_scan_q0 = zigzag_scan; - h->zigzag_scan8x8_q0 = zigzag_scan8x8; + h->zigzag_scan8x8_q0 = ff_zigzag_direct; h->zigzag_scan8x8_cavlc_q0 = zigzag_scan8x8_cavlc; h->field_scan_q0 = field_scan; h->field_scan8x8_q0 = field_scan8x8; @@ -6981,7 +6981,7 @@ const uint8_t *jvt_list, const uint8_t *fallback_list){ MpegEncContext * const s = &h->s; int i, last = 8, next = 8; - const uint8_t *scan = size == 16 ? zigzag_scan : zigzag_scan8x8; + const uint8_t *scan = size == 16 ? zigzag_scan : ff_zigzag_direct; if(!get_bits1(&s->gb)) /* matrix not written, we use the predicted one */ memcpy(factors, fallback_list, size*sizeof(uint8_t)); else