diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 14:05:55 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-13 14:06:01 +0100 |
commit | 3bcf443f91d83dffbcfdafa07d151c2b7028bf04 (patch) | |
tree | 12a6de6dba3e9b19cd9227171d8999f8563235ef /libavcodec/xbmenc.c | |
parent | 6cd1dbe6dffe82e7561a52b731f2cb57a3967bc0 (diff) | |
parent | 22c436c85e0dd81702b4e9289b90755b7310982f (diff) | |
download | ffmpeg-3bcf443f91d83dffbcfdafa07d151c2b7028bf04.tar.gz |
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>
Diffstat (limited to 'libavcodec/xbmenc.c')
0 files changed, 0 insertions, 0 deletions