From eaa8c1f9fe254ea0e370e57fec1f5439a50894e8 Mon Sep 17 00:00:00 2001 From: Martin Storsjö Date: Wed, 9 Nov 2011 00:50:37 +0200 Subject: crypto: Don't manually free memory allocated via AVOptions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavformat/crypto.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'libavformat/crypto.c') 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; } -- cgit v1.2.3