diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:52:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-12 14:52:34 +0200 |
| commit | f391e405dfde35bfb3fea9ccc09bd67b5cc0a8f2 (patch) | |
| tree | 739e823660aa365a392c509acd1ac1686272029f /libavformat/rtmpproto.c | |
| parent | d6135a886d85bdbf271c55a238c3336670adc742 (diff) | |
| parent | e002e3291e6dc7953f843abf56fc14f08f238b21 (diff) | |
| download | ffmpeg-f391e405dfde35bfb3fea9ccc09bd67b5cc0a8f2.tar.gz | |
Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'
* commit 'e002e3291e6dc7953f843abf56fc14f08f238b21':
Use the new aes/md5/sha/tree allocation functions
avutil: Add functions for allocating opaque contexts for algorithms
svq3: fix pointer type warning
svq3: replace unsafe pointer casting with intreadwrite macros
parseutils-test: various cleanups
Conflicts:
doc/APIchanges
libavcodec/svq3.c
libavutil/parseutils.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtmpproto.c')
| -rw-r--r-- | libavformat/rtmpproto.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtmpproto.c b/libavformat/rtmpproto.c index d76a5114dc..dbe987058a 100644 --- a/libavformat/rtmpproto.c +++ b/libavformat/rtmpproto.c @@ -859,7 +859,7 @@ int ff_rtmp_calc_digest(const uint8_t *src, int len, int gap, uint8_t hmac_buf[64+32] = {0}; int i; - sha = av_mallocz(av_sha_size); + sha = av_sha_alloc(); if (!sha) return AVERROR(ENOMEM); |