Changeset e91f27cb in ffmpeg

Timestamp:

Jun 1, 2014, 10:32:30 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9b538537

Parents:

6b9cbc9a (diff), 59cb5747 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (06/01/14 22:32:06)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/01/14 22:32:30)

Message:

Merge commit '59cb5747ec3c5cd842b94e574c37889521c97cc4'

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

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)