diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-01 11:42:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-01 11:42:30 +0200 |
| commit | 57b8ce414be574a772d386f57afa502eac072085 (patch) | |
| tree | 7f33dce5aa004c3e2788804016f605f23fc2916e /libavformat/rtpenc.c | |
| parent | 0c8efe48917fd9d6d2c9b61397318c1fd7c3f8c4 (diff) | |
| parent | 2e814d0329aded98c811d0502839618f08642685 (diff) | |
| download | ffmpeg-57b8ce414be574a772d386f57afa502eac072085.tar.gz | |
Merge commit '2e814d0329aded98c811d0502839618f08642685'
* commit '2e814d0329aded98c811d0502839618f08642685':
rtpenc: Simplify code by introducing a macro for rescaling NTP timestamps
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.c')
| -rw-r--r-- | libavformat/rtpenc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 2c93c206dd..9fd361d303 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -276,8 +276,7 @@ static void rtcp_send_sr(AVFormatContext *s1, int64_t ntp_time) avio_w8(s1->pb, RTCP_SR); avio_wb16(s1->pb, 6); /* length in words - 1 */ avio_wb32(s1->pb, s->ssrc); - avio_wb32(s1->pb, ntp_time / 1000000); - avio_wb32(s1->pb, ((ntp_time % 1000000) << 32) / 1000000); + avio_wb64(s1->pb, NTP_TO_RTP_FORMAT(ntp_time)); avio_wb32(s1->pb, rtp_ts); avio_wb32(s1->pb, s->packet_count); avio_wb32(s1->pb, s->octet_count); |