Changeset d6b37de4 in ffmpeg

Timestamp:

Aug 1, 2013, 9:58:17 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fcccb4c1

Parents:

b39f012d (diff), 892b0be1 (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 09:58:13)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (08/01/13 09:58:17)

Message:

Merge commit '892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec'

• commit '892b0be1dfbdeaf71235fb6c593286e4f5c7e4ec': rtpproto: Simplify the rtp_read function by looping over the fds

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

(No files)