diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:13:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-16 12:13:16 +0100 |
| commit | 1459f34251c35e5ba5af38ab9ae25ec134dbc845 (patch) | |
| tree | 5f5d7b8d1efb472240a405e829db278fecfde179 /libavformat/srtp.c | |
| parent | 9ea65c65f70029896b1c23afd9925ae42c4d009f (diff) | |
| parent | 977d4a3b8a2dbc2fb5e747c7072485016c9cdfaa (diff) | |
| download | ffmpeg-1459f34251c35e5ba5af38ab9ae25ec134dbc845.tar.gz | |
Merge commit '977d4a3b8a2dbc2fb5e747c7072485016c9cdfaa'
* commit '977d4a3b8a2dbc2fb5e747c7072485016c9cdfaa':
rtpdec_mpeg4: Check the return value from malloc
srtp: Mark a few variables as uninitialized
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/srtp.c')
| -rw-r--r-- | libavformat/srtp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/srtp.c b/libavformat/srtp.c index b3c428ba0f..7d344b816d 100644 --- a/libavformat/srtp.c +++ b/libavformat/srtp.c @@ -121,8 +121,8 @@ int ff_srtp_decrypt(struct SRTPContext *s, uint8_t *buf, int *lenptr) { uint8_t iv[16] = { 0 }, hmac[20]; int len = *lenptr; - int ext, seq_largest; - uint32_t ssrc, roc; + int ext, av_uninit(seq_largest); + uint32_t ssrc, av_uninit(roc); uint64_t index; int rtcp; |