OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
20cb3fa
)
avformat/crypto: fix key vs iv typo
author
Michael Niedermayer
<michaelni@gmx.at>
Tue, 9 Dec 2014 18:58:56 +0000
(19:58 +0100)
committer
Michael Niedermayer
<michaelni@gmx.at>
Tue, 9 Dec 2014 18:58:56 +0000
(19:58 +0100)
Fixes Ticket 4167
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/crypto.c
patch
|
blob
|
history
diff --git
a/libavformat/crypto.c
b/libavformat/crypto.c
index
c1754b0
..
22529fb
100644
(file)
--- a/
libavformat/crypto.c
+++ b/
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->key
len, "decryption IV")) < 0)
+ c->
iv, c->iv
len, "decryption IV")) < 0)
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,
- c->
key, c->key
len, "encryption IV")) < 0)
+ c->
iv, c->iv
len, "encryption IV")) < 0)
goto err;
}