Hello, please use <filename>: K&R formatting cosmetics as title for patches like this one.
On Thu, Mar 20, 2014 at 3:02 AM, Tanja Batchelor <[email protected]> wrote: > --- > libavformat/mpeg.c | 82 > +++++++++++++++++++++++++++--------------------------- > 1 file changed, 41 insertions(+), 41 deletions(-) > > diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c > index 7430bb0..99112ac 100644 > --- a/libavformat/mpeg.c > +++ b/libavformat/mpeg.c > @@ -38,15 +38,15 @@ static int check_pes(uint8_t *p, uint8_t *end){ you have to add a space between ) and { > &&((p[4] & 0xC0) == 0x00 || (p[4]&0xC0)>>2 == (p[6]&0xF0)); don't start lines with && or || > > for(p+=3; p<end && *p == 0xFF; p++); > - if((*p&0xC0) == 0x40) p+=2; > - if((*p&0xF0) == 0x20){ > + if ((*p&0xC0) == 0x40) p += 2; > + if ((*p&0xF0) == 0x20){ > pes1= p[0]&p[2]&p[4]&1; > - }else if((*p&0xF0) == 0x30){ > + } else if ((*p&0xF0) == 0x30){ > pes1= p[0]&p[2]&p[4]&p[5]&p[7]&p[9]&1; > - }else > + } else please remove { } from single line comments > pes1 = *p == 0x0F; > > - return pes1||pes2; > + return pes1 || pes2; > } > > static int check_pack_header(const uint8_t *buf) { > @@ -60,35 +60,35 @@ static int mpegps_probe(AVProbeData *p) > int i; > int score=0; add a space before and after = > > - for(i=0; i<p->buf_size; i++){ > + for (i = 0; i < p->buf_size; i++) { > code = (code<<8) + p->buf[i]; > if ((code & 0xffffff00) == 0x100) { > int len= p->buf[i+1] << 8 | p->buf[i+2]; > int pes= check_pes(p->buf+i, p->buf+p->buf_size); > int pack = check_pack_header(p->buf+i); space before and after + > - if(code == SYSTEM_HEADER_START_CODE) sys++; > - else if(code == PACK_START_CODE && pack) pspack++; > - else if((code & 0xf0) == VIDEO_ID && pes) vid++; > + if (code == SYSTEM_HEADER_START_CODE) sys++; > + else if (code == PACK_START_CODE && pack) pspack++; > + else if ((code & 0xf0) == VIDEO_ID && pes) vid++; > // skip pes payload to avoid start code emulation for private > // and audio streams > > //02-Penguin.flac has sys:0 priv1:0 pspack:0 vid:0 audio:1 add a space after // > @@ -218,7 +218,7 @@ static int mpegps_read_pes_header(AVFormatContext *s, > startcode = find_next_start_code(s->pb, &size, &m->header_state); > last_sync = avio_tell(s->pb); > if (startcode < 0){ > - if(s->pb->eof_reached) > + if (s->pb->eof_reached) > return AVERROR_EOF; > //FIXME we should remember header_state same > return AVERROR(EAGAIN); > @@ -332,11 +332,11 @@ static int mpegps_read_pes_header(AVFormatContext *s, > } > } > } > - if(header_len < 0) > + if (header_len < 0) > goto error_redo; > avio_skip(s->pb, header_len); > } > - else if( c!= 0xf ) > + else if (c!= 0xf) > goto redo; > > if (startcode == PRIVATE_STREAM_1 && !m->psm_es_type[startcode & 0xff]) { > @@ -355,12 +355,12 @@ static int mpegps_read_pes_header(AVFormatContext *s, > } > } > } > - if(len<0) > + if (len < 0) > goto error_redo; > - if(dts != AV_NOPTS_VALUE && ppos){ > + if (dts != AV_NOPTS_VALUE && ppos){ > int i; > - for(i=0; i<s->nb_streams; i++){ > - if(startcode == s->streams[i]->id && > + for (i = 0; i < s->nb_streams; i++){ > + if (startcode == s->streams[i]->id && > s->pb->seekable /* index useless on streams anyway */) { > ff_reduce_index(s, i); > av_add_index_entry(s->streams[i], *ppos, dts, 0, 0, > AVINDEX_KEYFRAME /* FIXME keyframe? */); this is kinda a long line, you should try to return when you go past column 80-85 > @@ -390,41 +390,41 @@ static int mpegps_read_packet(AVFormatContext *s, > if (len < 0) > return len; > > - if(startcode == 0x1bd) { > + if (startcode == 0x1bd) { > dvdaudio_substream_type = avio_r8(s->pb); > avio_skip(s->pb, 3); > len -= 4; > } The kind of nits here are for your improvement, I'll push a correct version. If you wish to submit more cosmetics I do recommend using https://wiki.libav.org/CodingStyle/Uncrustify Thanks for your contribution. -- Vittorio _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
