Merge commit '98563953442560dd83aab938f86de3e5a22a891f'

* commit '98563953442560dd83aab938f86de3e5a22a891f': rtpenc_aac: Fix sending fragmented frames Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago · f6f1e1a7a1
parent e73b3dba3e 9856395344
commit f6f1e1a7a1
1 changed files with 1 additions and 1 deletions
--- 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;