[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Aug 15 11:29:02 2013 +0200| [2c959eccc69cca1a5b83d643d01271df2b280bb5] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpproto: Check for the right feature when reading a sockaddr_in6

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

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