Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Aug 2013 09:29:02 +0000 (11:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 15 Aug 2013 09:34:30 +0000 (11:34 +0200)
commit2c959eccc69cca1a5b83d643d01271df2b280bb5
tree6c63ab0822727cfc9864788fcb1e201018a329bb
parentbfbe07670bb0d0d902c03953d44f9482709696ee
parentc3386bd5b4d3662f94e902a0fe3e9e869e29967d
Merge remote-tracking branch 'qatar/master'

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

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