Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit '1fc64e2e07'

Browse source 
* commit '1fc64e2e07':
  rtpenc: Write conditional statements on separate lines

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-01 01:00:57 +01:00
commit cfe33c98b7
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libavformat/rtpenc_xiph.c
View file

@ -82,14 +82,16 @@ void ff_rtp_send_xiph(AVFormatContext *s1, const uint8_t *buff, int size)
}
// buffer current frame to send later
if (0 == s->num_frames) s->timestamp = s->cur_timestamp;
if (0 == s->num_frames)
s->timestamp = s->cur_timestamp;
s->num_frames++;
// Set packet header. Normally, this is OR'd with frag and xdt,
// but those are zero, so omitted here
*q++ = s->num_frames;
if (s->num_frames > 1) q = s->buf_ptr; // jump ahead if needed
if (s->num_frames > 1)
q = s->buf_ptr; // jump ahead if needed
*q++ = (size >> 8) & 0xff;
*q++ = size & 0xff;
memcpy(q, buff, size);