Changeset 0f5a40c2 in ffmpeg

Timestamp:

Aug 1, 2013, 11:51:44 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9408d990

Parents:

2ee58af5 (diff), ee37d581 (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/01/13 11:51:37)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/01/13 11:51:44)

Message:

Merge commit 'ee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2'

• commit 'ee37d5811caa8f4ad125a37fe6ce3f9e66cd72f2': rtpproto: Allow specifying a separate rtcp port in ff_rtp_set_remote_url

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

(No files)