summaryrefslogtreecommitdiff
path: root/libavformat/rtpenc_amr.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2015-02-27 12:32:42 +0200
committerMartin Storsjö <martin@martin.st>2015-02-28 22:54:26 +0200
commitbde2bba45c2f2df27a8534028bda09a6e7f835e2 (patch)
tree73dcf2a4ee78c96eab14c627600aa1c7a87851e6 /libavformat/rtpenc_amr.c
parentd4c7fc02f9f59e721e76debf4a595df529707545 (diff)
rtpenc: Restructure if statements in packetizers to simplify adding more conditions
Factorize out the s->num_frames check at the start of the if statements, simplifying adding more alternative causes for sending the buffered frames. Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/rtpenc_amr.c')
-rw-r--r--libavformat/rtpenc_amr.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/rtpenc_amr.c b/libavformat/rtpenc_amr.c
index 9f4f21a1de..6da5f0f17a 100644
--- a/libavformat/rtpenc_amr.c
+++ b/libavformat/rtpenc_amr.c
@@ -36,7 +36,9 @@ 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 || (s->num_frames && len + size - 1 > s->max_payload_size)) {
+ if (s->num_frames &&
+ (s->num_frames == s->max_frames_per_packet ||
+ 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)