Changeset 91a69757 in ffmpeg

Timestamp:

Nov 3, 2013, 12:38:33 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

2ed562d5

Parents:

90c329cc (diff), d7639785 (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> (11/03/13 12:07:42)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (11/03/13 12:38:33)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: rtmpproto: Reorder conditions to help dead code elimination

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

(No files)