From patchwork Fri Feb 27 11:00:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [02/12] rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 56880 Message-Id: <1425034865-28812-2-git-send-email-martin@martin.st> To: libav-devel@libav.org Date: Fri, 27 Feb 2015 13:00:55 +0200 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= List-Id: libav development This doesn't fix any bug, but makes the code simpler for later patches, and more straightforward to read as is. --- libavformat/rtpenc_amr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtpenc_amr.c b/libavformat/rtpenc_amr.c index 73da8c8..9f4f21a 100644 --- a/libavformat/rtpenc_amr.c +++ b/libavformat/rtpenc_amr.c @@ -36,7 +36,7 @@ void ff_rtp_send_amr(AVFormatContext *s1, const uint8_t *buff, int size) /* Test if the packet must be sent. */ len = s->buf_ptr - s->buf; - if (s->num_frames == s->max_frames_per_packet || (len && len + size - 1 > s->max_payload_size)) { + if (s->num_frames == s->max_frames_per_packet || (s->num_frames && len + size - 1 > s->max_payload_size)) { int header_size = s->num_frames + 1; p = s->buf + max_header_toc_size - header_size; if (p != s->buf)