Merge commit '7650caf013f45ebebf128855735a0c6350836ea4'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Feb 2015 20:30:01 +0000 (21:30 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Feb 2015 20:30:14 +0000 (21:30 +0100)
commit5346b57ee719f95e2ccd07359a30e55e2a8d41ac
treebc6f42e147a7647418b06490da9ea241208c6508
parent2130ed3312d468fd3f6e299d35c013fe568b83ab
parent7650caf013f45ebebf128855735a0c6350836ea4
Merge commit '7650caf013f45ebebf128855735a0c6350836ea4'

* commit '7650caf013f45ebebf128855735a0c6350836ea4':
  rtpdec_h264: Use av_realloc instead of av_malloc+mempcy

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpdec_h264.c