diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 19:33:03 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-01 19:33:16 +0100 |
| commit | 5a7a56d7bef3304a85b49133e42b6a73ab4de181 (patch) | |
| tree | 14b16070c1d34d6986c58c9b1b8beb6bf91493f9 | |
| parent | 81c3bb78aca7db56020a61f66cab3b6719a7e1b3 (diff) | |
| parent | b264453de93999ea6f23e98014390af468f56146 (diff) | |
| download | ffmpeg-5a7a56d7bef3304a85b49133e42b6a73ab4de181.tar.gz | |
Merge commit 'b264453de93999ea6f23e98014390af468f56146'
* commit 'b264453de93999ea6f23e98014390af468f56146':
rtpenc: Remove some superfluous parentheses
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtpenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 9fd361d303..c9cea864eb 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -272,7 +272,7 @@ static void rtcp_send_sr(AVFormatContext *s1, int64_t ntp_time) s->last_rtcp_ntp_time = ntp_time; rtp_ts = av_rescale_q(ntp_time - s->first_rtcp_ntp_time, (AVRational){1, 1000000}, s1->streams[0]->time_base) + s->base_timestamp; - avio_w8(s1->pb, (RTP_VERSION << 6)); + avio_w8(s1->pb, RTP_VERSION << 6); avio_w8(s1->pb, RTCP_SR); avio_wb16(s1->pb, 6); /* length in words - 1 */ avio_wb32(s1->pb, s->ssrc); @@ -308,7 +308,7 @@ void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m) av_dlog(s1, "rtp_send_data size=%d\n", len); /* build the RTP header */ - avio_w8(s1->pb, (RTP_VERSION << 6)); + avio_w8(s1->pb, RTP_VERSION << 6); avio_w8(s1->pb, (s->payload_type & 0x7f) | ((m & 0x01) << 7)); avio_wb16(s1->pb, s->seq); avio_wb32(s1->pb, s->timestamp); |