diff options
| author | Måns Rullgård <mans@mansr.com> | 2010-07-10 22:12:30 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2010-07-10 22:12:30 +0000 |
| commit | 8fc0162ac44f3e60798552ca6d19387be95cae4c (patch) | |
| tree | 443f7c684a3a8be0e9b70d67a91b8572bfa1ddd2 /libavutil/des.c | |
| parent | e6b22522c94cfccda97018e52ab65da8c69d8a56 (diff) | |
| download | ffmpeg-8fc0162ac44f3e60798552ca6d19387be95cae4c.tar.gz | |
Add av_ prefix to bswap macros
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavutil/des.c')
| -rw-r--r-- | libavutil/des.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavutil/des.c b/libavutil/des.c index 45913425f3..9c1a530666 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 ? be2ne_64(*(uint64_t *)iv) : 0; + uint64_t iv_val = iv ? av_be2ne64(*(uint64_t *)iv) : 0; while (count-- > 0) { uint64_t dst_val; - uint64_t src_val = src ? be2ne_64(*(const uint64_t *)src) : 0; + uint64_t src_val = src ? av_be2ne64(*(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 = be2ne_64(dst_val); + *(uint64_t *)dst = av_be2ne64(dst_val); src += 8; dst += 8; } if (iv) - *(uint64_t *)iv = be2ne_64(iv_val); + *(uint64_t *)iv = av_be2ne64(iv_val); } #ifdef TEST |