Merge commit '977d4a3b8a2dbc2fb5e747c7072485016c9cdfaa'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Jan 2013 11:13:10 +0000 (12:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 16 Jan 2013 11:13:16 +0000 (12:13 +0100)
commit1459f34251c35e5ba5af38ab9ae25ec134dbc845
tree5f5d7b8d1efb472240a405e829db278fecfde179
parent9ea65c65f70029896b1c23afd9925ae42c4d009f
parent977d4a3b8a2dbc2fb5e747c7072485016c9cdfaa
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>
libavformat/rtpdec_mpeg4.c
libavformat/srtp.c