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)
* commit '4b054a3400f728c54470ee6a1eefe1d82420f6a2':
  rtpproto: Check the right feature detection macro

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

Simple merge