From 4dbac18e2e43e35fe528b1ce4370b2d9dc06779f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Fri, 9 Dec 2011 20:42:52 +0200
Subject: [PATCH] rtpenc: Simplify code by introducing a separate end pointer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Also remove redundant parentheses.
Signed-off-by: Martin Storsjö <martin@martin.st>
---
libavformat/rtpenc_h264.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/libavformat/rtpenc_h264.c b/libavformat/rtpenc_h264.c
index 9ca6f7f68eb..1a486cf96e0 100644
--- a/libavformat/rtpenc_h264.c
+++ b/libavformat/rtpenc_h264.c
@@ -62,17 +62,17 @@ static void nal_send(AVFormatContext *s1, const uint8_t *buf, int size, int last
void ff_rtp_send_h264(AVFormatContext *s1, const uint8_t *buf1, int size)
{
- const uint8_t *r;
+ const uint8_t *r, *end = buf1 + size;
RTPMuxContext *s = s1->priv_data;
s->timestamp = s->cur_timestamp;
- r = ff_avc_find_startcode(buf1, buf1 + size);
- while (r < buf1 + size) {
+ r = ff_avc_find_startcode(buf1, end);
+ while (r < end) {
const uint8_t *r1;
while(!*(r++));
- r1 = ff_avc_find_startcode(r, buf1 + size);
- nal_send(s1, r, r1 - r, (r1 == buf1 + size));
+ r1 = ff_avc_find_startcode(r, end);
+ nal_send(s1, r, r1 - r, r1 == end);
r = r1;
}
}
--
GitLab