Browse Source

crypto: Don't manually free memory allocated via AVOptions

Signed-off-by: Martin Storsjö <martin@martin.st>
tags/n0.9
Martin Storsjö 13 years ago
parent
commit
eaa8c1f9fe
1 changed files with 1 additions and 6 deletions
  1. +1
    -6
      libavformat/crypto.c

+ 1
- 6
libavformat/crypto.c View File

@@ -61,7 +61,7 @@ static const AVClass crypto_class = {
static int crypto_open(URLContext *h, const char *uri, int flags) static int crypto_open(URLContext *h, const char *uri, int flags)
{ {
const char *nested_url; const char *nested_url;
int ret;
int ret = 0;
CryptoContext *c = h->priv_data; CryptoContext *c = h->priv_data;


if (!av_strstart(uri, "crypto+", &nested_url) && 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; h->is_streamed = 1;


return 0;
err: err:
av_freep(&c->key);
av_freep(&c->iv);
return ret; return ret;
} }


@@ -157,8 +154,6 @@ static int crypto_close(URLContext *h)
if (c->hd) if (c->hd)
ffurl_close(c->hd); ffurl_close(c->hd);
av_freep(&c->aes); av_freep(&c->aes);
av_freep(&c->key);
av_freep(&c->iv);
return 0; return 0;
} }




Loading…
Cancel
Save