Merge commit '4b054a3400f728c54470ee6a1eefe1d82420f6a2'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:31:11 +0000 (12:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 16 Aug 2013 10:31:15 +0000 (12:31 +0200)
commite1ec7990fe25081614cc7c366e1f821c8a2e7a77
treebf36e22a16bb5896bfd5a29080e8eb0dd46f4723
parent165e42b5428fd0b1dbf0039e5b8555e5cce08aa9
parent4b054a3400f728c54470ee6a1eefe1d82420f6a2
Merge commit '4b054a3400f728c54470ee6a1eefe1d82420f6a2'

* commit '4b054a3400f728c54470ee6a1eefe1d82420f6a2':
  rtpproto: Check the right feature detection macro

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/rtpproto.c