Changeset f21f969a in ffmpeg

Timestamp:

Apr 30, 2014, 6:03:06 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

67979b59

Parents:

0eb9482 (diff), 344f7b5a (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> (04/30/14 18:02:42)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/30/14 18:03:06)

Message:

Merge commit '344f7b5a7e0d50573dec402dfe6228676f3889d9'

• commit '344f7b5a7e0d50573dec402dfe6228676f3889d9': hls: Report the current media sequence

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

(No files)