Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Nov 2013 12:07:42 +0000 (13:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 3 Nov 2013 12:38:33 +0000 (13:38 +0100)
* qatar/master:
  rtmpproto: Reorder conditions to help dead code elimination

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

Trivial merge