summaryrefslogtreecommitdiff
path: root/libavformat/rtpenc.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-01 01:00:57 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-01 01:01:01 +0100
commitcfe33c98b74b97e9b06231ffb981aefdb15be189 (patch)
tree299fb684d04805da1be00acf59b084923b0d39ca /libavformat/rtpenc.c
parentba069e08bdaa431ed8198ac20d2e648de95bc664 (diff)
parent1fc64e2e07787bbca82a72c146588e850e6d098a (diff)
downloadffmpeg-cfe33c98b74b97e9b06231ffb981aefdb15be189.tar.gz
Merge commit '1fc64e2e07787bbca82a72c146588e850e6d098a'
* commit '1fc64e2e07787bbca82a72c146588e850e6d098a': rtpenc: Write conditional statements on separate lines Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rtpenc.c')
-rw-r--r--libavformat/rtpenc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index 5fe712117f..51cab6f14b 100644
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -223,7 +223,8 @@ static int rtp_write_header(AVFormatContext *s1)
break;
case AV_CODEC_ID_VORBIS:
case AV_CODEC_ID_THEORA:
- if (!s->max_frames_per_packet) s->max_frames_per_packet = 15;
+ if (!s->max_frames_per_packet)
+ s->max_frames_per_packet = 15;
s->max_frames_per_packet = av_clip(s->max_frames_per_packet, 1, 15);
s->max_payload_size -= 6; // ident+frag+tdt/vdt+pkt_num+pkt_length
s->num_frames = 0;