# HG changeset patch # User mru # Date 1278799741 0 # Node ID a64b9fa63635b2cc544c47d88cabb4d16d4f5133 # Parent 79fc252c65cd22e152dcaf17d44d865677f342f2 bswap: change ME to NE in macro names Other parts of FFmpeg use NE (native endian) rather than ME (machine). This makes it consistent. diff -r 79fc252c65cd -r a64b9fa63635 asfcrypt.c --- a/asfcrypt.c Fri Jul 09 12:14:33 2010 +0000 +++ b/asfcrypt.c Sat Jul 10 22:09:01 2010 +0000 @@ -170,7 +170,7 @@ ms_state = multiswap_enc(ms_keys, ms_state, AV_RL64(qwords)); multiswap_invert_keys(ms_keys); packetkey = (packetkey << 32) | (packetkey >> 32); - packetkey = le2me_64(packetkey); + packetkey = le2ne_64(packetkey); packetkey = multiswap_dec(ms_keys, ms_state, packetkey); AV_WL64(qwords, packetkey); } diff -r 79fc252c65cd -r a64b9fa63635 nutdec.c --- a/nutdec.c Fri Jul 09 12:14:33 2010 +0000 +++ b/nutdec.c Sat Jul 10 22:09:01 2010 +0000 @@ -94,7 +94,7 @@ int64_t size; // start= url_ftell(bc) - 8; - startcode= be2me_64(startcode); + startcode= be2ne_64(startcode); startcode= ff_crc04C11DB7_update(0, (uint8_t*)&startcode, 8); init_checksum(bc, ff_crc04C11DB7_update, startcode); diff -r 79fc252c65cd -r a64b9fa63635 smacker.c --- a/smacker.c Fri Jul 09 12:14:33 2010 +0000 +++ b/smacker.c Sat Jul 10 22:09:01 2010 +0000 @@ -213,10 +213,10 @@ av_free(smk->frm_flags); return AVERROR(EIO); } - ((int32_t*)st->codec->extradata)[0] = le2me_32(smk->mmap_size); - ((int32_t*)st->codec->extradata)[1] = le2me_32(smk->mclr_size); - ((int32_t*)st->codec->extradata)[2] = le2me_32(smk->full_size); - ((int32_t*)st->codec->extradata)[3] = le2me_32(smk->type_size); + ((int32_t*)st->codec->extradata)[0] = le2ne_32(smk->mmap_size); + ((int32_t*)st->codec->extradata)[1] = le2ne_32(smk->mclr_size); + ((int32_t*)st->codec->extradata)[2] = le2ne_32(smk->full_size); + ((int32_t*)st->codec->extradata)[3] = le2ne_32(smk->type_size); smk->curstream = -1; smk->nextpos = url_ftell(pb); diff -r 79fc252c65cd -r a64b9fa63635 sol.c --- a/sol.c Fri Jul 09 12:14:33 2010 +0000 +++ b/sol.c Sat Jul 10 22:09:01 2010 +0000 @@ -34,7 +34,7 @@ { /* check file header */ uint16_t magic; - magic=le2me_16(*((uint16_t*)p->buf)); + magic=le2ne_16(*((uint16_t*)p->buf)); if ((magic == 0x0B8D || magic == 0x0C0D || magic == 0x0C8D) && p->buf[2] == 'S' && p->buf[3] == 'O' && p->buf[4] == 'L' && p->buf[5] == 0)