Merge remote-tracking branch 'qatar/master'

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

See: 23e9e5c7d9
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-11-03 13:07:42 +01:00

Diff Content Not Available