virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-23 04:24:35 +02:00
Code Issues Releases Activity

Merge commit '1fc64e2e07787bbca82a72c146588e850e6d098a'

Browse Source 
* commit '1fc64e2e07787bbca82a72c146588e850e6d098a':
  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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/rtpenc.c
View File

@ -223,7 +223,8 @@ static int rtp_write_header(AVFormatContext *s1)
break; break;
case AV_CODEC_ID_VORBIS: case AV_CODEC_ID_VORBIS:
case AV_CODEC_ID_THEORA: 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_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->max_payload_size -= 6; // ident+frag+tdt/vdt+pkt_num+pkt_length
s->num_frames = 0; s->num_frames = 0;

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 // 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++; s->num_frames++;
// Set packet header. Normally, this is OR'd with frag and xdt, // Set packet header. Normally, this is OR'd with frag and xdt,
// but those are zero, so omitted here // but those are zero, so omitted here
*q++ = s->num_frames; *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 >> 8) & 0xff;
*q++ = size & 0xff; *q++ = size & 0xff;
memcpy(q, buff, size); memcpy(q, buff, size);