Merge commit '24eb3c791606fe98a1591c13a8b2ba6c342bb3b5'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 03:13:50 +0000 (04:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 21 Jan 2014 03:13:57 +0000 (04:13 +0100)
* commit '24eb3c791606fe98a1591c13a8b2ba6c342bb3b5':
  rtmpproto: Avoid using uninitialized memory

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

Simple merge