[FFmpeg-cvslog] crypto: Don't manually free memory allocated via AVOptions

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Wed Nov  9 00:50:37 2011 +0200| [eaa8c1f9fe254ea0e370e57fec1f5439a50894e8] | committer: Martin Storsjö

crypto: Don't manually free memory allocated via AVOptions

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=eaa8c1f9fe254ea0e370e57fec1f5439a50894e8
---

 libavformat/crypto.c |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/libavformat/crypto.c b/libavformat/crypto.c
index b9d3e03..2f0e2bd 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;
 }