Changeset d68ed9f in ffmpeg

Timestamp:

May 6, 2014, 10:39:54 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4cdea929

Parents:

fc7d0d82 (diff), 7ce3bd96 (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> (05/06/14 22:39:26)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (05/06/14 22:39:54)

Message:

Merge commit '7ce3bd9614717e545af8fb8455032c807e389b78'

• commit '7ce3bd9614717e545af8fb8455032c807e389b78': rtmpproto: Support alternative slist parameter in rtmp URLs

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

(No files)