On Wednesday, March 19, 2014, Luca Barbato <lu_z...@gentoo.org> wrote:
> On 19/03/14 22:23, Tanja Batchelor wrote: > > --- > > libavformat/mpeg.c | 6 +++--- > > libavformat/srtp.c | 10 +++++----- > > 2 files changed, 8 insertions(+), 8 deletions(-) > > > I already gave you a review on irc. > > > > > diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c > > index 7430bb0..7996d84 100644 > > --- a/libavformat/mpeg.c > > +++ b/libavformat/mpeg.c > > @@ -336,7 +336,7 @@ static int mpegps_read_pes_header(AVFormatContext *s, > > goto error_redo; > > avio_skip(s->pb, header_len); > > } > > - else if( c!= 0xf ) > > + else if(c!= 0xf) > > This change is not complete. > > https://libav.org/developer.html#Coding-Rules-1 > > > > goto redo; > > > > if (startcode == PRIVATE_STREAM_1 && !m->psm_es_type[startcode & > 0xff]) { > > @@ -446,8 +446,8 @@ static int mpegps_read_packet(AVFormatContext *s, > > } else if (startcode >= 0x80 && startcode <= 0x87) { > > type = AVMEDIA_TYPE_AUDIO; > > codec_id = AV_CODEC_ID_AC3; > > - } else if ( ( startcode >= 0x88 && startcode <= 0x8f) > > - ||( startcode >= 0x98 && startcode <= 0x9f)) { > > + } else if ((startcode >= 0x88 && startcode <= 0x8f) > > + ||(startcode >= 0x98 && startcode <= 0x9f)) { > > Again, this is wrong the || should have a space, and it should be at the > end of the first line, like this: > > > + } else if ((startcode >= 0x88 && startcode <= 0x8f) || > > > The patch below should be another commit. ...and they are wrong. av_log(context, AV_LOG_SEVERITY, "blah\a\b\r\n"); > > > diff --git a/libavformat/srtp.c b/libavformat/srtp.c > > index 6659bfc..7ccba47 100644 > > --- a/libavformat/srtp.c > > +++ b/libavformat/srtp.c > > @@ -400,8 +400,8 @@ static void print_data(const uint8_t *buf, int len) > > { > > int i; > > for (i = 0; i < len; i++) > > - printf("%02x", buf[i]); > > - printf("\n"); > > + av_log("%02x", buf[i]); > > + av_log("\n"); > > } > > > > static int test_decrypt(struct SRTPContext *srtp, const uint8_t *in, > int len, > > @@ -426,11 +426,11 @@ static void test_encrypt(const uint8_t *data, int > in_len, const char *suite, > > len = ff_srtp_encrypt(&enc, data, in_len, buf, sizeof(buf)); > > if (!ff_srtp_decrypt(&dec, buf, &len)) { > > if (len == in_len && !memcmp(buf, data, len)) > > - printf("Decrypted content matches input\n"); > > + av_log("Decrypted content matches input\n"); > > else > > - printf("Decrypted content doesn't match input\n"); > > + av_log("Decrypted content doesn't match input\n"); > > } else { > > - printf("Decryption failed\n"); > > + av_log("Decryption failed\n"); > > } > > ff_srtp_free(&enc); > > ff_srtp_free(&dec); > > > > Please resend with the changes requested above. > > Thanks a lot > > lu > > _______________________________________________ > libav-devel mailing list > libav-devel@libav.org <javascript:;> > https://lists.libav.org/mailman/listinfo/libav-devel > _______________________________________________ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
