summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-01 00:48:00 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-01 00:48:04 +0100
commitf6f1e1a7a14d0cde4055fa98be2783c5a1131d5b (patch)
treeaacd044eaa49b180c28832b50ae3cc716c6a404f /libavformat
parente73b3dba3e8084eb7141c2a8e27fba4950f2ba60 (diff)
parent98563953442560dd83aab938f86de3e5a22a891f (diff)
Merge commit '98563953442560dd83aab938f86de3e5a22a891f'
* commit '98563953442560dd83aab938f86de3e5a22a891f': rtpenc_aac: Fix sending fragmented frames Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/rtpenc_aac.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/rtpenc_aac.c b/libavformat/rtpenc_aac.c
index be8f43ae69..7f2621f5f9 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;