diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-07-10 22:09:01 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-07-10 22:09:01 +0000 |
| commit | e6b22522c94cfccda97018e52ab65da8c69d8a56 (patch) | |
| tree | 4ecb09a4ae3f895d70ab882d841347d943eef0a2 /libavformat | |
| parent | 6b7917ba3ba16cbbcc81d9e007b26f82dd06400f (diff) | |
bswap: change ME to NE in macro names
Other parts of FFmpeg use NE (native endian) rather than ME (machine).
This makes it consistent.
Originally committed as revision 24169 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/asfcrypt.c | 2 | ||||
| -rw-r--r-- | libavformat/nutdec.c | 2 | ||||
| -rw-r--r-- | libavformat/smacker.c | 8 | ||||
| -rw-r--r-- | libavformat/sol.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/libavformat/asfcrypt.c b/libavformat/asfcrypt.c index 09e9af6f2c..993c9dac91 100644 --- a/libavformat/asfcrypt.c +++ b/libavformat/asfcrypt.c @@ -170,7 +170,7 @@ void ff_asfcrypt_dec(const uint8_t key[20], uint8_t *data, int len) { 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 --git a/libavformat/nutdec.c b/libavformat/nutdec.c index aae58261bb..76ed7d470d 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -94,7 +94,7 @@ static int get_packetheader(NUTContext *nut, ByteIOContext *bc, int calculate_ch 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 --git a/libavformat/smacker.c b/libavformat/smacker.c index 898dbd2ded..8a3a26e6ab 100644 --- a/libavformat/smacker.c +++ b/libavformat/smacker.c @@ -213,10 +213,10 @@ static int smacker_read_header(AVFormatContext *s, AVFormatParameters *ap) 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 --git a/libavformat/sol.c b/libavformat/sol.c index 3ae2d04bb3..824e56ea28 100644 --- a/libavformat/sol.c +++ b/libavformat/sol.c @@ -34,7 +34,7 @@ static int sol_probe(AVProbeData *p) { /* 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) |