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)
commite91f27cbbb276bbdc9f7bc18e69e9b5fe6d16387
treebf0aabff9f89a43d370a7200b935b4d469022dac
parent6b9cbc9a1164988b3517f4f160f7937e1644cdc3
parent59cb5747ec3c5cd842b94e574c37889521c97cc4
Merge commit '59cb5747ec3c5cd842b94e574c37889521c97cc4'

* commit '59cb5747ec3c5cd842b94e574c37889521c97cc4':
  rtmpproto: read metadata to set correct FLV header

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