repositories
/
deb_ffmpeg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Debian version 2.5.1~trusty
[deb_ffmpeg.git]
/
ffmpeg
/
libavformat
/
crypto.c
diff --git
a/ffmpeg/libavformat/crypto.c
b/ffmpeg/libavformat/crypto.c
index c1754b0b114b8914a809652e51634b4565e08834..22529fb52189454ed9fc86fa9b005e560b16d80b 100644
(file)
--- a/
ffmpeg/libavformat/crypto.c
+++ b/
ffmpeg/libavformat/crypto.c
@@
-122,7
+122,7
@@
static int crypto_open2(URLContext *h, const char *uri, int flags, AVDictionary
c->key, c->keylen, "decryption key")) < 0)
goto err;
if ((ret = set_aes_arg(c, &c->decrypt_iv, &c->decrypt_ivlen,
c->key, c->keylen, "decryption key")) < 0)
goto err;
if ((ret = set_aes_arg(c, &c->decrypt_iv, &c->decrypt_ivlen,
- c->
key, c->key
len, "decryption IV")) < 0)
+ c->
iv, c->iv
len, "decryption IV")) < 0)
goto err;
}
goto err;
}
@@
-132,7
+132,7
@@
static int crypto_open2(URLContext *h, const char *uri, int flags, AVDictionary
if (ret < 0)
goto err;
if ((ret = set_aes_arg(c, &c->encrypt_iv, &c->encrypt_ivlen,
if (ret < 0)
goto err;
if ((ret = set_aes_arg(c, &c->encrypt_iv, &c->encrypt_ivlen,
- c->
key, c->key
len, "encryption IV")) < 0)
+ c->
iv, c->iv
len, "encryption IV")) < 0)
goto err;
}
goto err;
}