Mercurial > libavcodec.hg
changeset 12129:8b28e74de2c0 libavcodec
Add av_ prefix to bswap macros
| author | mru |
|---|---|
| date | Sat, 10 Jul 2010 22:12:30 +0000 |
| parents | ee740a4e80c5 |
| children | 917a70cf7681 |
| files | 4xm.c 8bps.c aac_parser.c ac3_parser.c ac3enc.c alsdec.c asv1.c atrac3.c bmp.c cook.c dca.c dsputil.c eamad.c flacenc.c get_bits.h imc.c indeo3.c mjpegdec.c pngdec.c pngenc.c pnmdec.c put_bits.h r210dec.c shorten.c smacker.c tta.c v210dec.c v210x.c |
| diffstat | 28 files changed, 90 insertions(+), 90 deletions(-) [+] |
line wrap: on
line diff
--- a/4xm.c Sat Jul 10 22:09:01 2010 +0000 +++ b/4xm.c Sat Jul 10 22:12:30 2010 +0000 @@ -333,16 +333,16 @@ av_log(f->avctx, AV_LOG_ERROR, "mv out of pic\n"); return; } - mcdc(dst, src, log2w, h, stride, 1, le2ne_16(*f->wordstream++)); + mcdc(dst, src, log2w, h, stride, 1, av_le2ne16(*f->wordstream++)); }else if(code == 5){ - mcdc(dst, src, log2w, h, stride, 0, le2ne_16(*f->wordstream++)); + mcdc(dst, src, log2w, h, stride, 0, av_le2ne16(*f->wordstream++)); }else if(code == 6){ if(log2w){ - dst[0] = le2ne_16(*f->wordstream++); - dst[1] = le2ne_16(*f->wordstream++); + dst[0] = av_le2ne16(*f->wordstream++); + dst[1] = av_le2ne16(*f->wordstream++); }else{ - dst[0 ] = le2ne_16(*f->wordstream++); - dst[stride] = le2ne_16(*f->wordstream++); + dst[0 ] = av_le2ne16(*f->wordstream++); + dst[stride] = av_le2ne16(*f->wordstream++); } } }
--- a/8bps.c Sat Jul 10 22:09:01 2010 +0000 +++ b/8bps.c Sat Jul 10 22:12:30 2010 +0000 @@ -100,7 +100,7 @@ for(row = 0; row < height; row++) { pixptr = c->pic.data[0] + row * c->pic.linesize[0] + planemap[p]; pixptr_end = pixptr + c->pic.linesize[0]; - dlen = be2ne_16(*(const unsigned short *)(lp+row*2)); + dlen = av_be2ne16(*(const unsigned short *)(lp+row*2)); /* Decode a row of this plane */ while(dlen > 0) { if(dp + 1 >= buf+buf_size) return -1;
--- a/aac_parser.c Sat Jul 10 22:09:01 2010 +0000 +++ b/aac_parser.c Sat Jul 10 22:12:30 2010 +0000 @@ -80,7 +80,7 @@ uint8_t u8[8]; } tmp; - tmp.u64 = be2ne_64(state); + tmp.u64 = av_be2ne64(state); init_get_bits(&bits, tmp.u8+8-AAC_ADTS_HEADER_SIZE, AAC_ADTS_HEADER_SIZE * 8); if ((size = ff_aac_parse_header(&bits, &hdr)) < 0)
--- a/ac3_parser.c Sat Jul 10 22:09:01 2010 +0000 +++ b/ac3_parser.c Sat Jul 10 22:12:30 2010 +0000 @@ -164,7 +164,7 @@ union { uint64_t u64; uint8_t u8[8]; - } tmp = { be2ne_64(state) }; + } tmp = { av_be2ne64(state) }; AC3HeaderInfo hdr; GetBitContext gbc;
--- a/ac3enc.c Sat Jul 10 22:09:01 2010 +0000 +++ b/ac3enc.c Sat Jul 10 22:12:30 2010 +0000 @@ -1161,14 +1161,14 @@ /* Now we must compute both crcs : this is not so easy for crc1 because it is at the beginning of the data... */ frame_size_58 = (frame_size >> 1) + (frame_size >> 3); - crc1 = bswap_16(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, + crc1 = av_bswap16(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, frame + 4, 2 * frame_size_58 - 4)); /* XXX: could precompute crc_inv */ crc_inv = pow_poly((CRC16_POLY >> 1), (16 * frame_size_58) - 16, CRC16_POLY); crc1 = mul_poly(crc_inv, crc1, CRC16_POLY); AV_WB16(frame+2,crc1); - crc2 = bswap_16(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, + crc2 = av_bswap16(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, frame + 2 * frame_size_58, (frame_size - frame_size_58) * 2 - 2)); AV_WB16(frame+2*frame_size-2,crc2);
--- a/alsdec.c Sat Jul 10 22:09:01 2010 +0000 +++ b/alsdec.c Sat Jul 10 22:12:30 2010 +0000 @@ -1464,7 +1464,7 @@ int32_t v; if (swap) - v = bswap_32(src[sample]); + v = av_bswap32(src[sample]); else v = src[sample]; if (!HAVE_BIGENDIAN) @@ -1482,7 +1482,7 @@ for (sample = 0; sample < ctx->cur_frame_length * avctx->channels; sample++) - *dest++ = bswap_16(src[sample]); + *dest++ = av_bswap16(src[sample]); } else { ctx->dsp.bswap_buf((uint32_t*)ctx->crc_buffer, data, ctx->cur_frame_length * avctx->channels);
--- a/asv1.c Sat Jul 10 22:09:01 2010 +0000 +++ b/asv1.c Sat Jul 10 22:12:30 2010 +0000 @@ -588,8 +588,8 @@ avctx->extradata= av_mallocz(8); avctx->extradata_size=8; - ((uint32_t*)avctx->extradata)[0]= le2ne_32(a->inv_qscale); - ((uint32_t*)avctx->extradata)[1]= le2ne_32(AV_RL32("ASUS")); + ((uint32_t*)avctx->extradata)[0]= av_le2ne32(a->inv_qscale); + ((uint32_t*)avctx->extradata)[1]= av_le2ne32(AV_RL32("ASUS")); for(i=0; i<64; i++){ int q= 32*scale*ff_mpeg1_default_intra_matrix[i];
--- a/atrac3.c Sat Jul 10 22:09:01 2010 +0000 +++ b/atrac3.c Sat Jul 10 22:12:30 2010 +0000 @@ -179,7 +179,7 @@ off = (intptr_t)inbuffer & 3; buf = (const uint32_t*) (inbuffer - off); - c = be2ne_32((0x537F6103 >> (off*8)) | (0x537F6103 << (32-(off*8)))); + c = av_be2ne32((0x537F6103 >> (off*8)) | (0x537F6103 << (32-(off*8)))); bytes += 3 + off; for (i = 0; i < bytes/4; i++) obuf[i] = c ^ buf[i];
--- a/bmp.c Sat Jul 10 22:09:01 2010 +0000 +++ b/bmp.c Sat Jul 10 22:12:30 2010 +0000 @@ -290,7 +290,7 @@ uint16_t *dst = (uint16_t *) ptr; for(j = 0; j < avctx->width; j++) - *dst++ = le2ne_16(*src++); + *dst++ = av_le2ne16(*src++); buf += n; ptr += linesize;
--- a/cook.c Sat Jul 10 22:09:01 2010 +0000 +++ b/cook.c Sat Jul 10 22:12:30 2010 +0000 @@ -316,12 +316,12 @@ /* FIXME: 64 bit platforms would be able to do 64 bits at a time. * I'm too lazy though, should be something like * for(i=0 ; i<bitamount/64 ; i++) - * (int64_t)out[i] = 0x37c511f237c511f2^be2ne_64(int64_t)in[i]); + * (int64_t)out[i] = 0x37c511f237c511f2^av_be2ne64(int64_t)in[i]); * Buffer alignment needs to be checked. */ off = (intptr_t)inbuffer & 3; buf = (const uint32_t*) (inbuffer - off); - c = be2ne_32((0x37c511f2 >> (off*8)) | (0x37c511f2 << (32-(off*8)))); + c = av_be2ne32((0x37c511f2 >> (off*8)) | (0x37c511f2 << (32-(off*8)))); bytes += 3 + off; for (i = 0; i < bytes/4; i++) obuf[i] = c ^ buf[i];
--- a/dca.c Sat Jul 10 22:09:01 2010 +0000 +++ b/dca.c Sat Jul 10 22:12:30 2010 +0000 @@ -1230,7 +1230,7 @@ return src_size; case DCA_MARKER_RAW_LE: for (i = 0; i < (src_size + 1) >> 1; i++) - *sdst++ = bswap_16(*ssrc++); + *sdst++ = av_bswap16(*ssrc++); return src_size; case DCA_MARKER_14B_BE: case DCA_MARKER_14B_LE:
--- a/dsputil.c Sat Jul 10 22:09:01 2010 +0000 +++ b/dsputil.c Sat Jul 10 22:12:30 2010 +0000 @@ -247,17 +247,17 @@ int i; for(i=0; i+8<=w; i+=8){ - dst[i+0]= bswap_32(src[i+0]); - dst[i+1]= bswap_32(src[i+1]); - dst[i+2]= bswap_32(src[i+2]); - dst[i+3]= bswap_32(src[i+3]); - dst[i+4]= bswap_32(src[i+4]); - dst[i+5]= bswap_32(src[i+5]); - dst[i+6]= bswap_32(src[i+6]); - dst[i+7]= bswap_32(src[i+7]); + dst[i+0]= av_bswap32(src[i+0]); + dst[i+1]= av_bswap32(src[i+1]); + dst[i+2]= av_bswap32(src[i+2]); + dst[i+3]= av_bswap32(src[i+3]); + dst[i+4]= av_bswap32(src[i+4]); + dst[i+5]= av_bswap32(src[i+5]); + dst[i+6]= av_bswap32(src[i+6]); + dst[i+7]= av_bswap32(src[i+7]); } for(;i<w; i++){ - dst[i+0]= bswap_32(src[i+0]); + dst[i+0]= av_bswap32(src[i+0]); } }
--- a/eamad.c Sat Jul 10 22:09:01 2010 +0000 +++ b/eamad.c Sat Jul 10 22:12:30 2010 +0000 @@ -53,7 +53,7 @@ { int i; for (i=0; i<count; i++) - dst[i] = bswap_16(src[i]); + dst[i] = av_bswap16(src[i]); } static av_cold int decode_init(AVCodecContext *avctx)
--- a/flacenc.c Sat Jul 10 22:09:01 2010 +0000 +++ b/flacenc.c Sat Jul 10 22:12:30 2010 +0000 @@ -1153,7 +1153,7 @@ { int crc; flush_put_bits(&s->pb); - crc = bswap_16(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, + crc = av_bswap16(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, s->pb.buf, put_bits_count(&s->pb)>>3)); put_bits(&s->pb, 16, crc); flush_put_bits(&s->pb); @@ -1164,7 +1164,7 @@ #if HAVE_BIGENDIAN int i; for(i = 0; i < s->frame.blocksize*s->channels; i++) { - int16_t smp = le2ne_16(samples[i]); + int16_t smp = av_le2ne16(samples[i]); av_md5_update(s->md5ctx, (uint8_t *)&smp, 2); } #else
--- a/get_bits.h Sat Jul 10 22:09:01 2010 +0000 +++ b/get_bits.h Sat Jul 10 22:12:30 2010 +0000 @@ -267,7 +267,7 @@ # define UPDATE_CACHE(name, gb)\ if(name##_bit_count > 0){\ - const uint32_t next= be2ne_32( *name##_buffer_ptr );\ + const uint32_t next= av_be2ne32( *name##_buffer_ptr );\ name##_cache0 |= NEG_USR32(next,name##_bit_count);\ name##_cache1 |= next<<name##_bit_count;\ name##_buffer_ptr++;\ @@ -319,7 +319,7 @@ re_bit_count += n; re_buffer_ptr += re_bit_count>>5; re_bit_count &= 31; - re_cache0 = be2ne_32( re_buffer_ptr[-1] ) << re_bit_count; + re_cache0 = av_be2ne32( re_buffer_ptr[-1] ) << re_bit_count; re_cache1 = 0; UPDATE_CACHE(re, s) CLOSE_READER(re, s)
--- a/imc.c Sat Jul 10 22:09:01 2010 +0000 +++ b/imc.c Sat Jul 10 22:12:30 2010 +0000 @@ -660,7 +660,7 @@ return -1; } for(i = 0; i < IMC_BLOCK_SIZE / 2; i++) - buf16[i] = bswap_16(((const uint16_t*)buf)[i]); + buf16[i] = av_bswap16(((const uint16_t*)buf)[i]); init_get_bits(&q->gb, (const uint8_t*)buf16, IMC_BLOCK_SIZE * 8);
--- a/indeo3.c Sat Jul 10 22:09:01 2010 +0000 +++ b/indeo3.c Sat Jul 10 22:12:30 2010 +0000 @@ -359,14 +359,14 @@ switch(correction_type_sp[0][k]) { case 0: - *cur_lp = le2ne_32(((le2ne_32(*ref_lp) >> 1) + correction_lp[lp2 & 0x01][k]) << 1); + *cur_lp = av_le2ne32(((av_le2ne32(*ref_lp) >> 1) + correction_lp[lp2 & 0x01][k]) << 1); lp2++; break; case 1: - res = ((le2ne_16(((unsigned short *)(ref_lp))[0]) >> 1) + correction_lp[lp2 & 0x01][*buf1]) << 1; - ((unsigned short *)cur_lp)[0] = le2ne_16(res); - res = ((le2ne_16(((unsigned short *)(ref_lp))[1]) >> 1) + correction_lp[lp2 & 0x01][k]) << 1; - ((unsigned short *)cur_lp)[1] = le2ne_16(res); + res = ((av_le2ne16(((unsigned short *)(ref_lp))[0]) >> 1) + correction_lp[lp2 & 0x01][*buf1]) << 1; + ((unsigned short *)cur_lp)[0] = av_le2ne16(res); + res = ((av_le2ne16(((unsigned short *)(ref_lp))[1]) >> 1) + correction_lp[lp2 & 0x01][k]) << 1; + ((unsigned short *)cur_lp)[1] = av_le2ne16(res); buf1++; lp2++; break; @@ -462,19 +462,19 @@ switch(correction_type_sp[lp2 & 0x01][k]) { case 0: - cur_lp[width_tbl[1]] = le2ne_32(((le2ne_32(*ref_lp) >> 1) + correction_lp[lp2 & 0x01][k]) << 1); + cur_lp[width_tbl[1]] = av_le2ne32(((av_le2ne32(*ref_lp) >> 1) + correction_lp[lp2 & 0x01][k]) << 1); if(lp2 > 0 || flag1 == 0 || strip->ypos != 0) cur_lp[0] = ((cur_lp[-width_tbl[1]] >> 1) + (cur_lp[width_tbl[1]] >> 1)) & 0xFEFEFEFE; else - cur_lp[0] = le2ne_32(((le2ne_32(*ref_lp) >> 1) + correction_lp[lp2 & 0x01][k]) << 1); + cur_lp[0] = av_le2ne32(((av_le2ne32(*ref_lp) >> 1) + correction_lp[lp2 & 0x01][k]) << 1); lp2++; break; case 1: - res = ((le2ne_16(((unsigned short *)ref_lp)[0]) >> 1) + correction_lp[lp2 & 0x01][*buf1]) << 1; - ((unsigned short *)cur_lp)[width_tbl[2]] = le2ne_16(res); - res = ((le2ne_16(((unsigned short *)ref_lp)[1]) >> 1) + correction_lp[lp2 & 0x01][k]) << 1; - ((unsigned short *)cur_lp)[width_tbl[2]+1] = le2ne_16(res); + res = ((av_le2ne16(((unsigned short *)ref_lp)[0]) >> 1) + correction_lp[lp2 & 0x01][*buf1]) << 1; + ((unsigned short *)cur_lp)[width_tbl[2]] = av_le2ne16(res); + res = ((av_le2ne16(((unsigned short *)ref_lp)[1]) >> 1) + correction_lp[lp2 & 0x01][k]) << 1; + ((unsigned short *)cur_lp)[width_tbl[2]+1] = av_le2ne16(res); if(lp2 > 0 || flag1 == 0 || strip->ypos != 0) cur_lp[0] = ((cur_lp[-width_tbl[1]] >> 1) + (cur_lp[width_tbl[1]] >> 1)) & 0xFEFEFEFE; @@ -591,8 +591,8 @@ switch(correction_type_sp[lp2 & 0x01][k]) { case 0: - cur_lp[width_tbl[1]] = le2ne_32(((le2ne_32(lv1) >> 1) + correctionloworder_lp[lp2 & 0x01][k]) << 1); - cur_lp[width_tbl[1]+1] = le2ne_32(((le2ne_32(lv2) >> 1) + correctionhighorder_lp[lp2 & 0x01][k]) << 1); + cur_lp[width_tbl[1]] = av_le2ne32(((av_le2ne32(lv1) >> 1) + correctionloworder_lp[lp2 & 0x01][k]) << 1); + cur_lp[width_tbl[1]+1] = av_le2ne32(((av_le2ne32(lv2) >> 1) + correctionhighorder_lp[lp2 & 0x01][k]) << 1); if(lp2 > 0 || strip->ypos != 0 || flag1 == 0) { cur_lp[0] = ((cur_lp[-width_tbl[1]] >> 1) + (cur_lp[width_tbl[1]] >> 1)) & 0xFEFEFEFE; cur_lp[1] = ((cur_lp[-width_tbl[1]+1] >> 1) + (cur_lp[width_tbl[1]+1] >> 1)) & 0xFEFEFEFE; @@ -604,8 +604,8 @@ break; case 1: - cur_lp[width_tbl[1]] = le2ne_32(((le2ne_32(lv1) >> 1) + correctionloworder_lp[lp2 & 0x01][*buf1]) << 1); - cur_lp[width_tbl[1]+1] = le2ne_32(((le2ne_32(lv2) >> 1) + correctionloworder_lp[lp2 & 0x01][k]) << 1); + cur_lp[width_tbl[1]] = av_le2ne32(((av_le2ne32(lv1) >> 1) + correctionloworder_lp[lp2 & 0x01][*buf1]) << 1); + cur_lp[width_tbl[1]+1] = av_le2ne32(((av_le2ne32(lv2) >> 1) + correctionloworder_lp[lp2 & 0x01][k]) << 1); if(lp2 > 0 || strip->ypos != 0 || flag1 == 0) { cur_lp[0] = ((cur_lp[-width_tbl[1]] >> 1) + (cur_lp[width_tbl[1]] >> 1)) & 0xFEFEFEFE; cur_lp[1] = ((cur_lp[-width_tbl[1]+1] >> 1) + (cur_lp[width_tbl[1]+1] >> 1)) & 0xFEFEFEFE; @@ -748,20 +748,20 @@ case 0: lv1 = correctionloworder_lp[lp2 & 0x01][k]; lv2 = correctionhighorder_lp[lp2 & 0x01][k]; - cur_lp[0] = le2ne_32(((le2ne_32(ref_lp[0]) >> 1) + lv1) << 1); - cur_lp[1] = le2ne_32(((le2ne_32(ref_lp[1]) >> 1) + lv2) << 1); - cur_lp[width_tbl[1]] = le2ne_32(((le2ne_32(ref_lp[width_tbl[1]]) >> 1) + lv1) << 1); - cur_lp[width_tbl[1]+1] = le2ne_32(((le2ne_32(ref_lp[width_tbl[1]+1]) >> 1) + lv2) << 1); + cur_lp[0] = av_le2ne32(((av_le2ne32(ref_lp[0]) >> 1) + lv1) << 1); + cur_lp[1] = av_le2ne32(((av_le2ne32(ref_lp[1]) >> 1) + lv2) << 1); + cur_lp[width_tbl[1]] = av_le2ne32(((av_le2ne32(ref_lp[width_tbl[1]]) >> 1) + lv1) << 1); + cur_lp[width_tbl[1]+1] = av_le2ne32(((av_le2ne32(ref_lp[width_tbl[1]+1]) >> 1) + lv2) << 1); lp2++; break; case 1: lv1 = correctionloworder_lp[lp2 & 0x01][*buf1++]; lv2 = correctionloworder_lp[lp2 & 0x01][k]; - cur_lp[0] = le2ne_32(((le2ne_32(ref_lp[0]) >> 1) + lv1) << 1); - cur_lp[1] = le2ne_32(((le2ne_32(ref_lp[1]) >> 1) + lv2) << 1); - cur_lp[width_tbl[1]] = le2ne_32(((le2ne_32(ref_lp[width_tbl[1]]) >> 1) + lv1) << 1); - cur_lp[width_tbl[1]+1] = le2ne_32(((le2ne_32(ref_lp[width_tbl[1]+1]) >> 1) + lv2) << 1); + cur_lp[0] = av_le2ne32(((av_le2ne32(ref_lp[0]) >> 1) + lv1) << 1); + cur_lp[1] = av_le2ne32(((av_le2ne32(ref_lp[1]) >> 1) + lv2) << 1); + cur_lp[width_tbl[1]] = av_le2ne32(((av_le2ne32(ref_lp[width_tbl[1]]) >> 1) + lv1) << 1); + cur_lp[width_tbl[1]+1] = av_le2ne32(((av_le2ne32(ref_lp[width_tbl[1]+1]) >> 1) + lv2) << 1); lp2++; break; @@ -849,22 +849,22 @@ switch(correction_type_sp[lp2 & 0x01][k]) { case 0: - cur_lp[0] = le2ne_32(((le2ne_32(*ref_lp) >> 1) + correction_lp[lp2 & 0x01][k]) << 1); - cur_lp[width_tbl[1]] = le2ne_32(((le2ne_32(ref_lp[width_tbl[1]]) >> 1) + correction_lp[lp2 & 0x01][k]) << 1); + cur_lp[0] = av_le2ne32(((av_le2ne32(*ref_lp) >> 1) + correction_lp[lp2 & 0x01][k]) << 1); + cur_lp[width_tbl[1]] = av_le2ne32(((av_le2ne32(ref_lp[width_tbl[1]]) >> 1) + correction_lp[lp2 & 0x01][k]) << 1); lp2++; break; case 1: lv1 = (unsigned short)(correction_lp[lp2 & 0x01][*buf1++]); lv2 = (unsigned short)(correction_lp[lp2 & 0x01][k]); - res = (unsigned short)(((le2ne_16(((unsigned short *)ref_lp)[0]) >> 1) + lv1) << 1); - ((unsigned short *)cur_lp)[0] = le2ne_16(res); - res = (unsigned short)(((le2ne_16(((unsigned short *)ref_lp)[1]) >> 1) + lv2) << 1); - ((unsigned short *)cur_lp)[1] = le2ne_16(res); - res = (unsigned short)(((le2ne_16(((unsigned short *)ref_lp)[width_tbl[2]]) >> 1) + lv1) << 1); - ((unsigned short *)cur_lp)[width_tbl[2]] = le2ne_16(res); - res = (unsigned short)(((le2ne_16(((unsigned short *)ref_lp)[width_tbl[2]+1]) >> 1) + lv2) << 1); - ((unsigned short *)cur_lp)[width_tbl[2]+1] = le2ne_16(res); + res = (unsigned short)(((av_le2ne16(((unsigned short *)ref_lp)[0]) >> 1) + lv1) << 1); + ((unsigned short *)cur_lp)[0] = av_le2ne16(res); + res = (unsigned short)(((av_le2ne16(((unsigned short *)ref_lp)[1]) >> 1) + lv2) << 1); + ((unsigned short *)cur_lp)[1] = av_le2ne16(res); + res = (unsigned short)(((av_le2ne16(((unsigned short *)ref_lp)[width_tbl[2]]) >> 1) + lv1) << 1); + ((unsigned short *)cur_lp)[width_tbl[2]] = av_le2ne16(res); + res = (unsigned short)(((av_le2ne16(((unsigned short *)ref_lp)[width_tbl[2]+1]) >> 1) + lv2) << 1); + ((unsigned short *)cur_lp)[width_tbl[2]+1] = av_le2ne16(res); lp2++; break;
--- a/mjpegdec.c Sat Jul 10 22:09:01 2010 +0000 +++ b/mjpegdec.c Sat Jul 10 22:12:30 2010 +0000 @@ -1027,7 +1027,7 @@ return -1; id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16); - id = be2ne_32(id); + id = av_be2ne32(id); len -= 6; if(s->avctx->debug & FF_DEBUG_STARTCODE){ @@ -1134,7 +1134,7 @@ if ((s->start_code == APP1) && (len > (0x28 - 8))) { id = (get_bits(&s->gb, 16) << 16) | get_bits(&s->gb, 16); - id = be2ne_32(id); + id = av_be2ne32(id); len -= 4; if (id == AV_RL32("mjpg")) /* Apple MJPEG-A */ {
--- a/pngdec.c Sat Jul 10 22:09:01 2010 +0000 +++ b/pngdec.c Sat Jul 10 22:12:30 2010 +0000 @@ -429,7 +429,7 @@ if (length > 0x7fffffff) goto fail; tag32 = bytestream_get_be32(&s->bytestream); - tag = bswap_32(tag32); + tag = av_bswap32(tag32); dprintf(avctx, "png: tag=%c%c%c%c length=%u\n", (tag & 0xff), ((tag >> 8) & 0xff),
--- a/pngenc.c Sat Jul 10 22:09:01 2010 +0000 +++ b/pngenc.c Sat Jul 10 22:12:30 2010 +0000 @@ -199,7 +199,7 @@ crc = crc32(0, Z_NULL, 0); AV_WL32(tagbuf, tag); crc = crc32(crc, tagbuf, 4); - bytestream_put_be32(f, bswap_32(tag)); + bytestream_put_be32(f, av_bswap32(tag)); if (length > 0) { crc = crc32(crc, buf, length); memcpy(*f, buf, length);
--- a/pnmdec.c Sat Jul 10 22:09:01 2010 +0000 +++ b/pnmdec.c Sat Jul 10 22:12:30 2010 +0000 @@ -124,7 +124,7 @@ } else if (upgrade == 2) { unsigned int j, v, f = (65535 * 32768 + s->maxval / 2) / s->maxval; for (j = 0; j < n / 2; j++) { - v = be2ne_16(((uint16_t *)s->bytestream)[j]); + v = av_be2ne16(((uint16_t *)s->bytestream)[j]); ((uint16_t *)ptr)[j] = (v * f + 16384) >> 15; } }
--- a/put_bits.h Sat Jul 10 22:09:01 2010 +0000 +++ b/put_bits.h Sat Jul 10 22:12:30 2010 +0000 @@ -168,7 +168,7 @@ AV_WL32(s->buf_ptr, bit_buf); } else #endif - *(uint32_t *)s->buf_ptr = le2ne_32(bit_buf); + *(uint32_t *)s->buf_ptr = av_le2ne32(bit_buf); s->buf_ptr+=4; bit_buf = (bit_left==32)?0:value >> bit_left; bit_left+=32; @@ -186,7 +186,7 @@ AV_WB32(s->buf_ptr, bit_buf); } else #endif - *(uint32_t *)s->buf_ptr = be2ne_32(bit_buf); + *(uint32_t *)s->buf_ptr = av_be2ne32(bit_buf); //printf("bitbuf = %08x\n", bit_buf); s->buf_ptr+=4; bit_left+=32 - n; @@ -224,8 +224,8 @@ value<<= 32-n; - ptr[0] |= be2ne_32(value>>(index&31)); - ptr[1] = be2ne_32(value<<(32-(index&31))); + ptr[0] |= av_be2ne32(value>>(index&31)); + ptr[1] = av_be2ne32(value<<(32-(index&31))); //if(n>24) printf("%d %d\n", n, value); index+= n; s->index= index; @@ -252,7 +252,7 @@ int index= s->index; uint32_t *ptr= (uint32_t*)(((uint8_t *)s->buf)+(index>>3)); - ptr[0] |= be2ne_32(value<<(32-n-(index&7) )); + ptr[0] |= av_be2ne32(value<<(32-n-(index&7) )); ptr[1] = 0; //if(n>24) printf("%d %d\n", n, value); index+= n;
--- a/r210dec.c Sat Jul 10 22:09:01 2010 +0000 +++ b/r210dec.c Sat Jul 10 22:12:30 2010 +0000 @@ -61,7 +61,7 @@ for (h = 0; h < avctx->height; h++) { uint16_t *dst = (uint16_t *)dst_line; for (w = 0; w < avctx->width; w++) { - uint32_t pixel = be2ne_32(*src++); + uint32_t pixel = av_be2ne32(*src++); uint16_t r, g, b; b = pixel << 6; g = (pixel >> 4) & 0xffc0;
--- a/shorten.c Sat Jul 10 22:09:01 2010 +0000 +++ b/shorten.c Sat Jul 10 22:12:30 2010 +0000 @@ -184,12 +184,12 @@ static inline int get_le32(GetBitContext *gb) { - return bswap_32(get_bits_long(gb, 32)); + return av_bswap32(get_bits_long(gb, 32)); } static inline short get_le16(GetBitContext *gb) { - return bswap_16(get_bits_long(gb, 16)); + return av_bswap16(get_bits_long(gb, 16)); } static int decode_wave_header(AVCodecContext *avctx, uint8_t *header, int header_size)
--- a/smacker.c Sat Jul 10 22:09:01 2010 +0000 +++ b/smacker.c Sat Jul 10 22:12:30 2010 +0000 @@ -618,7 +618,7 @@ } if(bits) { //decode 16-bit data for(i = stereo; i >= 0; i--) - pred[i] = bswap_16(get_bits(&gb, 16)); + pred[i] = av_bswap16(get_bits(&gb, 16)); for(i = 0; i < stereo; i++) *samples++ = pred[i]; for(i = 0; i < unp_size / 2; i++) {
--- a/tta.c Sat Jul 10 22:09:01 2010 +0000 +++ b/tta.c Sat Jul 10 22:12:30 2010 +0000 @@ -221,7 +221,7 @@ { /* signature */ skip_bits(&s->gb, 32); -// if (get_bits_long(&s->gb, 32) != bswap_32(AV_RL32("TTA1"))) { +// if (get_bits_long(&s->gb, 32) != av_bswap32(AV_RL32("TTA1"))) { // av_log(s->avctx, AV_LOG_ERROR, "Missing magic\n"); // return -1; // }
--- a/v210dec.c Sat Jul 10 22:09:01 2010 +0000 +++ b/v210dec.c Sat Jul 10 22:12:30 2010 +0000 @@ -68,7 +68,7 @@ #define READ_PIXELS(a, b, c) \ do { \ - val = le2ne_32(*src++); \ + val = av_le2ne32(*src++); \ *a++ = val << 6; \ *b++ = (val >> 4) & 0xFFC0; \ *c++ = (val >> 14) & 0xFFC0; \ @@ -86,14 +86,14 @@ if (w < avctx->width - 1) { READ_PIXELS(u, y, v); - val = le2ne_32(*src++); + val = av_le2ne32(*src++); *y++ = val << 6; } if (w < avctx->width - 3) { *u++ = (val >> 4) & 0xFFC0; *y++ = (val >> 14) & 0xFFC0; - val = le2ne_32(*src++); + val = av_le2ne32(*src++); *v++ = val << 6; *y++ = (val >> 4) & 0xFFC0; }
--- a/v210x.c Sat Jul 10 22:09:01 2010 +0000 +++ b/v210x.c Sat Jul 10 22:12:30 2010 +0000 @@ -67,12 +67,12 @@ pic->key_frame= 1; for(;;){ - uint32_t v= be2ne_32(*src++); + uint32_t v= av_be2ne32(*src++); *udst++= (v>>16) & 0xFFC0; *ydst++= (v>>6 ) & 0xFFC0; *vdst++= (v<<4 ) & 0xFFC0; - v= be2ne_32(*src++); + v= av_be2ne32(*src++); *ydst++= (v>>16) & 0xFFC0; if(ydst >= yend){ @@ -87,7 +87,7 @@ *udst++= (v>>6 ) & 0xFFC0; *ydst++= (v<<4 ) & 0xFFC0; - v= be2ne_32(*src++); + v= av_be2ne32(*src++); *vdst++= (v>>16) & 0xFFC0; *ydst++= (v>>6 ) & 0xFFC0; @@ -102,7 +102,7 @@ *udst++= (v<<4 ) & 0xFFC0; - v= be2ne_32(*src++); + v= av_be2ne32(*src++); *ydst++= (v>>16) & 0xFFC0; *vdst++= (v>>6 ) & 0xFFC0; *ydst++= (v<<4 ) & 0xFFC0;