Message ID | 1388407731-24369-11-git-send-email-neolynx@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Em Mon, 30 Dec 2013 13:48:44 +0100 André Roth <neolynx@gmail.com> escreveu: > Signed-off-by: André Roth <neolynx@gmail.com> > --- > lib/libdvbv5/descriptors.c | 2 +- > lib/libdvbv5/descriptors/mpeg_pes.c | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/lib/libdvbv5/descriptors.c b/lib/libdvbv5/descriptors.c > index 226349e..f46aa4a 100644 > --- a/lib/libdvbv5/descriptors.c > +++ b/lib/libdvbv5/descriptors.c > @@ -1359,6 +1359,6 @@ void hexdump(struct dvb_v5_fe_parms *parms, const char *prefix, const unsigned c > for (i = strlen(hex); i < 49; i++) > strncat(spaces, " ", sizeof(spaces)); > ascii[j] = '\0'; > - dvb_log("%s %s %s %s", prefix, hex, spaces, ascii); > + dvb_log("%s%s %s %s", prefix, hex, spaces, ascii); > } > } > diff --git a/lib/libdvbv5/descriptors/mpeg_pes.c b/lib/libdvbv5/descriptors/mpeg_pes.c > index 1b518a3..98364a3 100644 > --- a/lib/libdvbv5/descriptors/mpeg_pes.c > +++ b/lib/libdvbv5/descriptors/mpeg_pes.c > @@ -33,7 +33,7 @@ void dvb_mpeg_pes_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf, ssize_ > bswap32(pes->bitfield); > bswap16(pes->length); > > - if (pes->sync != 0x000001 ) { > + if (pes->sync != 0x000001) { > dvb_logerr("mpeg pes invalid"); > return; > } Please merge this one with the patches that introduced the changes, if they weren't merged yet. The second hunk doesn't apply, as I requested changes on the patch that added the PES parser.
diff --git a/lib/libdvbv5/descriptors.c b/lib/libdvbv5/descriptors.c index 226349e..f46aa4a 100644 --- a/lib/libdvbv5/descriptors.c +++ b/lib/libdvbv5/descriptors.c @@ -1359,6 +1359,6 @@ void hexdump(struct dvb_v5_fe_parms *parms, const char *prefix, const unsigned c for (i = strlen(hex); i < 49; i++) strncat(spaces, " ", sizeof(spaces)); ascii[j] = '\0'; - dvb_log("%s %s %s %s", prefix, hex, spaces, ascii); + dvb_log("%s%s %s %s", prefix, hex, spaces, ascii); } } diff --git a/lib/libdvbv5/descriptors/mpeg_pes.c b/lib/libdvbv5/descriptors/mpeg_pes.c index 1b518a3..98364a3 100644 --- a/lib/libdvbv5/descriptors/mpeg_pes.c +++ b/lib/libdvbv5/descriptors/mpeg_pes.c @@ -33,7 +33,7 @@ void dvb_mpeg_pes_init(struct dvb_v5_fe_parms *parms, const uint8_t *buf, ssize_ bswap32(pes->bitfield); bswap16(pes->length); - if (pes->sync != 0x000001 ) { + if (pes->sync != 0x000001) { dvb_logerr("mpeg pes invalid"); return; }
Signed-off-by: André Roth <neolynx@gmail.com> --- lib/libdvbv5/descriptors.c | 2 +- lib/libdvbv5/descriptors/mpeg_pes.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)