Merge commit '59cb5747ec3c5cd842b94e574c37889521c97cc4'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 22:32:06 +0000 (00:32 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 1 Jun 2014 22:32:30 +0000 (00:32 +0200)
* commit '59cb5747ec3c5cd842b94e574c37889521c97cc4':
  rtmpproto: read metadata to set correct FLV header

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

Simple merge