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)
* commit '7650caf013f45ebebf128855735a0c6350836ea4':
  rtpdec_h264: Use av_realloc instead of av_malloc+mempcy

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

Simple merge