diff options
| author | Giorgio Vazzana <mywing81@gmail.com> | 2012-09-30 18:47:10 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-30 20:52:13 +0200 |
| commit | a8cb21fd62a1a148d5266324b85810be3c4aca4f (patch) | |
| tree | 8e8a92ca97975966f10083a5e19ad7e37774f152 | |
| parent | 178ecfc2570ffd4a5ab244d77a848533a5db2440 (diff) | |
| download | ffmpeg-a8cb21fd62a1a148d5266324b85810be3c4aca4f.tar.gz | |
xtea: fix decryption with --enable-small
iv decrypt handling code needs to be executed regardless of CONFIG_SMALL
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/xtea.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/xtea.c b/libavutil/xtea.c index 36b0ce0dc1..1c2bd04639 100644 --- a/libavutil/xtea.c +++ b/libavutil/xtea.c @@ -94,12 +94,12 @@ static void xtea_crypt_ecb(AVXTEA *ctx, uint8_t *dst, const uint8_t *src, DSTEP(0xDAA66D2BU, k1, k2); DSTEP(0x3C6EF372U, k2, k1); DSTEP(0x9E3779B9U, k3, k0); - if(iv){ +#endif + if (iv) { v0 ^= AV_RB32(iv ); v1 ^= AV_RB32(iv+4); memcpy(iv, src, 8); } -#endif } else { #if CONFIG_SMALL int i; |