diff options
author | Martin Storsjö <martin@martin.st> | 2011-11-09 02:50:37 +0400 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2011-11-10 12:51:13 +0400 |
commit | eaa8c1f9fe254ea0e370e57fec1f5439a50894e8 (patch) | |
tree | 5b16cb9f5c6799a31b696b33f69c2ecd145b4602 /libavformat/crypto.c | |
parent | d10361b65856982fe17032590f490d494f1a01e4 (diff) |
crypto: Don't manually free memory allocated via AVOptions
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/crypto.c')
-rw-r--r-- | libavformat/crypto.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/libavformat/crypto.c b/libavformat/crypto.c index b9d3e0326f..2f0e2bd1ee 100644 --- a/libavformat/crypto.c +++ b/libavformat/crypto.c @@ -61,7 +61,7 @@ static const AVClass crypto_class = { static int crypto_open(URLContext *h, const char *uri, int flags) { const char *nested_url; - int ret; + int ret = 0; CryptoContext *c = h->priv_data; if (!av_strstart(uri, "crypto+", &nested_url) && @@ -95,10 +95,7 @@ static int crypto_open(URLContext *h, const char *uri, int flags) h->is_streamed = 1; - return 0; err: - av_freep(&c->key); - av_freep(&c->iv); return ret; } @@ -157,8 +154,6 @@ static int crypto_close(URLContext *h) if (c->hd) ffurl_close(c->hd); av_freep(&c->aes); - av_freep(&c->key); - av_freep(&c->iv); return 0; } |