[FFmpeg-cvslog] avformat/crypto: fix key vs iv typo
Michael Niedermayer
git at videolan.org
Mon Dec 15 15:25:05 CET 2014
ffmpeg | branch: release/2.5 | Michael Niedermayer <michaelni at gmx.at> | Tue Dec 9 19:58:56 2014 +0100| [0103bc67fdd54f68c864de483e350014700b4740] | committer: Michael Niedermayer
avformat/crypto: fix key vs iv typo
Fixes Ticket 4167
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit 2d0117f816b92510546caf26414961ee6088f961)
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0103bc67fdd54f68c864de483e350014700b4740
---
libavformat/crypto.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavformat/crypto.c b/libavformat/crypto.c
index c1754b0..22529fb 100644
--- 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->keylen, "decryption IV")) < 0)
+ c->iv, c->ivlen, "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->keylen, "encryption IV")) < 0)
+ c->iv, c->ivlen, "encryption IV")) < 0)
goto err;
}
More information about the ffmpeg-cvslog
mailing list