Merge commit 'cd818b3a5709b9b08bd5901cb8863a8b61be265e'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 12:29:59 +0000 (14:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 4 Oct 2013 12:30:05 +0000 (14:30 +0200)
* commit 'cd818b3a5709b9b08bd5901cb8863a8b61be265e':
  rtmpproto: Validate the embedded flv packet size before copying

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

Simple merge