Changeset 78242e43 in ffmpeg

Timestamp:

Aug 11, 2013, 9:24:14 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

159dfd26

Parents:

6c7a0535 (diff), aa16a6b0 (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> (08/11/13 09:24:09)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/11/13 09:24:14)

Message:

Merge commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec'

• commit 'aa16a6b0c56e3f46c5d7efb706b87a8f7a1603ec': doc: Extend the rtmp example to include how to pass username/password

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

(No files)