Changeset d540e757 in ffmpeg

Timestamp:

Mar 7, 2014, 11:53:02 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

94ec2713

Parents:

774d0c9d (diff), 5b2ad78f (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> (03/07/14 11:52:59)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (03/07/14 11:53:02)

Message:

Merge commit '5b2ad78f97d43299adcb038c04346999fe9b196c'

• commit '5b2ad78f97d43299adcb038c04346999fe9b196c': rtmppkt: Handle extended timestamp field even for one-byte header

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

(No files)