Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Jan 2013 13:05:55 +0000 (14:05 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 13 Jan 2013 13:06:01 +0000 (14:06 +0100)
commit3bcf443f91d83dffbcfdafa07d151c2b7028bf04
tree12a6de6dba3e9b19cd9227171d8999f8563235ef
parent6cd1dbe6dffe82e7561a52b731f2cb57a3967bc0
parent22c436c85e0dd81702b4e9289b90755b7310982f
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  rtpdec: Send a valid "delay since SR" value in the RTCP RR packets

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