Changeset 178764e8 in ffmpeg

Timestamp:

Oct 18, 2014, 1:01:35 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7891b4fa

Parents:

e06263ef (diff), f4cd8b80 (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> (10/18/14 01:01:31)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (10/18/14 01:01:35)

Message:

Merge commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467'

• commit 'f4cd8b80b9cb2a9a4112d8abb1d3b93cd3b4e467': rtmpproto: Track last received timestamp

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

(No files)