Changeset 953a4191 in ffmpeg

Timestamp:

Sep 17, 2013, 9:22:54 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c9eb2ce0

Parents:

0483cfe (diff), ffb7669e (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> (09/17/13 09:22:51)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/17/13 09:22:54)

Message:

Merge commit 'ffb7669e47343ac0caa866361965fdb2bf6ed825'

• commit 'ffb7669e47343ac0caa866361965fdb2bf6ed825': rtmp: Support play method in listen mode

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

(No files)