har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '6d6bd3a3db24747ae5e10716f4782129c38951f6'

Browse Source 
* commit '6d6bd3a3db24747ae5e10716f4782129c38951f6':
  mpegts: Drop some unnecessary parentheses

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-07 21:42:30 +02:00
commit 066d776501
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/mpegtsenc.c
View File

@ -116,20 +116,20 @@ static void mpegts_write_section(MpegTSSection *s, uint8_t *buf, int len)
buf[len - 4] = (crc >> 24) & 0xff; buf[len - 4] = (crc >> 24) & 0xff;
buf[len - 3] = (crc >> 16) & 0xff; buf[len - 3] = (crc >> 16) & 0xff;
buf[len - 2] = (crc >> 8) & 0xff; buf[len - 2] = (crc >> 8) & 0xff;
buf[len - 1] = (crc) & 0xff; buf[len - 1] = crc & 0xff;
/* send each packet */ /* send each packet */
buf_ptr = buf; buf_ptr = buf;
while (len > 0) { while (len > 0) {
first = (buf == buf_ptr); first = buf == buf_ptr;
q = packet; q = packet;
*q++ = 0x47; *q++ = 0x47;
b = (s->pid >> 8); b = s->pid >> 8;
if (first) if (first)
b |= 0x40; b |= 0x40;
*q++ = b; *q++ = b;
*q++ = s->pid; *q++ = s->pid;
s->cc = (s->cc + 1) & 0xf; s->cc = s->cc + 1 & 0xf;
*q++ = 0x10 | s->cc; *q++ = 0x10 | s->cc;
if (first) if (first)
*q++ = 0; /* 0 offset */ *q++ = 0; /* 0 offset */
@ -951,12 +951,12 @@ static void mpegts_write_pes(AVFormatContext *s, AVStream *st,
/* prepare packet header */ /* prepare packet header */
q = buf; q = buf;
*q++ = 0x47; *q++ = 0x47;
val = (ts_st->pid >> 8); val = ts_st->pid >> 8;
if (is_start) if (is_start)
val |= 0x40; val |= 0x40;
*q++ = val; *q++ = val;
*q++ = ts_st->pid; *q++ = ts_st->pid;
ts_st->cc = (ts_st->cc + 1) & 0xf; ts_st->cc = ts_st->cc + 1 & 0xf;
*q++ = 0x10 | ts_st->cc; // payload indicator + CC *q++ = 0x10 | ts_st->cc; // payload indicator + CC
if (key && is_start && pts != AV_NOPTS_VALUE) { if (key && is_start && pts != AV_NOPTS_VALUE) {
// set Random Access for key frames // set Random Access for key frames