[FFmpeg-cvslog] Merge commit '4b054a3400f728c54470ee6a1eefe1d82420f6a2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 16 12:31:11 2013 +0200| [e1ec7990fe25081614cc7c366e1f821c8a2e7a77] | committer: Michael Niedermayer

Merge commit '4b054a3400f728c54470ee6a1eefe1d82420f6a2'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e1ec7990fe25081614cc7c366e1f821c8a2e7a77
---