summaryrefslogtreecommitdiff
path: root/libavutil/des.c
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-07-10 22:09:01 +0000
committerMåns Rullgård <mans@mansr.com>2010-07-10 22:09:01 +0000
commite6b22522c94cfccda97018e52ab65da8c69d8a56 (patch)
tree4ecb09a4ae3f895d70ab882d841347d943eef0a2 /libavutil/des.c
parent6b7917ba3ba16cbbcc81d9e007b26f82dd06400f (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 'libavutil/des.c')
-rw-r--r--libavutil/des.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/des.c b/libavutil/des.c
index ab66a0b59d..45913425f3 100644
--- a/libavutil/des.c
+++ b/libavutil/des.c
@@ -297,10 +297,10 @@ int av_des_init(AVDES *d, const uint8_t *key, int key_bits, int decrypt) {
}
void av_des_crypt(AVDES *d, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt) {
- uint64_t iv_val = iv ? be2me_64(*(uint64_t *)iv) : 0;
+ uint64_t iv_val = iv ? be2ne_64(*(uint64_t *)iv) : 0;
while (count-- > 0) {
uint64_t dst_val;
- uint64_t src_val = src ? be2me_64(*(const uint64_t *)src) : 0;
+ uint64_t src_val = src ? be2ne_64(*(const uint64_t *)src) : 0;
if (decrypt) {
uint64_t tmp = src_val;
if (d->triple_des) {
@@ -317,12 +317,12 @@ void av_des_crypt(AVDES *d, uint8_t *dst, const uint8_t *src, int count, uint8_t
}
iv_val = iv ? dst_val : 0;
}
- *(uint64_t *)dst = be2me_64(dst_val);
+ *(uint64_t *)dst = be2ne_64(dst_val);
src += 8;
dst += 8;
}
if (iv)
- *(uint64_t *)iv = be2me_64(iv_val);
+ *(uint64_t *)iv = be2ne_64(iv_val);
}
#ifdef TEST