Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Feb 2015 12:26:01 +0000 (13:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Feb 2015 12:26:07 +0000 (13:26 +0100)
* cehoyos/master:
  Fix compilation with --disable-protocol=udp

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

Trivial merge