diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:31:26 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-01 01:31:26 +0100 |
| commit | 78c59f3f0c9f20c3d143bd75fdf125bdf032b16d (patch) | |
| tree | e1ac24088abb4a0434e358f82e30150123ce2031 /libavformat/rtpenc_aac.c | |
| parent | 769b473a418638c74020998388b0be74f2ff1858 (diff) | |
| parent | bde2bba45c2f2df27a8534028bda09a6e7f835e2 (diff) | |
| download | ffmpeg-78c59f3f0c9f20c3d143bd75fdf125bdf032b16d.tar.gz | |
Merge commit 'bde2bba45c2f2df27a8534028bda09a6e7f835e2'
* commit 'bde2bba45c2f2df27a8534028bda09a6e7f835e2':
rtpenc: Restructure if statements in packetizers to simplify adding more conditions
Conflicts:
libavformat/rtpenc_xiph.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc_aac.c')
| -rw-r--r-- | libavformat/rtpenc_aac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/rtpenc_aac.c b/libavformat/rtpenc_aac.c index 981ae3706f..c20bbebc8f 100644 --- a/libavformat/rtpenc_aac.c +++ b/libavformat/rtpenc_aac.c @@ -39,7 +39,9 @@ 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 == s->max_frames_per_packet) || (s->num_frames && (len + size) > s->max_payload_size)) { + if (s->num_frames && + (s->num_frames == s->max_frames_per_packet || + (len + size) > s->max_payload_size)) { int au_size = s->num_frames * 2; p = s->buf + max_au_headers_size - au_size - 2; |