Changeset 7742edc0 in ffmpeg

Timestamp:

Sep 18, 2013, 8:50:54 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e81411e8

Parents:

f9ccdcb6 (diff), 0d378439 (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/18/13 08:50:49)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (09/18/13 08:50:54)

Message:

Merge commit '0d3784396b736374a61fea26268febdabd803a59'

• commit '0d3784396b736374a61fea26268febdabd803a59': rtmpproto: Check for the right return code

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

(No files)