Merge commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 21:54:56 +0000 (22:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Feb 2015 21:55:27 +0000 (22:55 +0100)
commit38e867f6c08ed421840bb29337351db59d8e4f86
tree9207a34fc3308d5977c363c5be32bc94c3f36c5c
parent62aec0c2d5b3ee55dc376279307e31f0d72a7b03
parent18f4fa251b0eb36392839f5bf6180f280dc04d8d
Merge commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d'

* commit '18f4fa251b0eb36392839f5bf6180f280dc04d8d':
  aac_adtstoasc_bsf: Check extradata memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aac_adtstoasc_bsf.c