From patchwork Fri Feb 27 11:00:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [01/12] rtpenc_aac: Fix sending fragmented frames X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 56879 Message-Id: <1425034865-28812-1-git-send-email-martin@martin.st> To: libav-devel@libav.org Cc: libav-stable@libav.org Date: Fri, 27 Feb 2015 13:00:54 +0200 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= List-Id: libav development After sending a fragmented frame, len (s->buf_ptr - s->buf) isn't zero, while s->num_frames is zero as intended. Using s->num_frames makes it work as intended, and is less convoluted than keeping track of (resetting) s->buf_ptr. This avoids sending stray data after sending a fragmented aac packet. CC: libav-stable@libav.org --- libavformat/rtpenc_aac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/rtpenc_aac.c b/libavformat/rtpenc_aac.c index 1b2fa0a..8e39605 100644 --- a/libavformat/rtpenc_aac.c +++ b/libavformat/rtpenc_aac.c @@ -39,7 +39,7 @@ void ff_rtp_send_aac(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 == max_frames_per_packet) || (len && (len + size) > s->max_payload_size)) { + if ((s->num_frames == max_frames_per_packet) || (s->num_frames && (len + size) > s->max_payload_size)) { int au_size = s->num_frames * 2; p = s->buf + max_au_headers_size - au_size - 2;