diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-25 02:29:09 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-25 02:29:09 +0200 |
| commit | 989fb05fe344d9666db858e0577c44969625184e (patch) | |
| tree | 294cb628ae90187c545eb7b0a28de2d304898888 /libavformat/crypto.c | |
| parent | 2671ab3996672c43b02076daca5bf00c5a6f1c68 (diff) | |
| parent | 2441003d3fdc01545690c2f397efd7acfd876d6c (diff) | |
| download | ffmpeg-989fb05fe344d9666db858e0577c44969625184e.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
vorbisdec: Employ proper printf format specifiers for uint_fast32_t.
applehttp: Don't export variant_bitrate if it isn't known
crypto: Use av_freep instead of av_free
configure: Add missing libm library dependencies to .pc files.
oggdec: reindent after 8f3eebd6
configure: Add missing libavutil inter-library dependencies to .pc files.
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/crypto.c')
| -rw-r--r-- | libavformat/crypto.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/crypto.c b/libavformat/crypto.c index ea6012ad09..fecc2c961c 100644 --- a/libavformat/crypto.c +++ b/libavformat/crypto.c @@ -153,9 +153,9 @@ static int crypto_close(URLContext *h) CryptoContext *c = h->priv_data; if (c->hd) ffurl_close(c->hd); - av_free(c->aes); - av_free(c->key); - av_free(c->iv); + av_freep(&c->aes); + av_freep(&c->key); + av_freep(&c->iv); return 0; } |