From: Marc Leeman Date: Thu, 1 Sep 2016 13:28:00 +0200 Subject: configure.in: adjust variable formatting --- configure.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index c033234..f99597d 100644 --- a/configure.in +++ b/configure.in @@ -31,7 +31,7 @@ fi dnl Check for headers AC_HEADER_STDC() -CFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@" -CXXFLAGS="-Wall -Wno-sign-compare @OGG_CFLAGS@ @VORBIS_CFLAGS@ @AVILIB_CFLAGS@ @DEBUG_CFLAGS@ @PROFILING_CFLAGS@" +CFLAGS="-Wall -Wno-sign-compare $OGG_CFLAGS $VORBIS_CFLAGS $AVILIB_CFLAGS $DEBUG_CFLAGS $PROFILING_CFLAGS" +CXXFLAGS="-Wall -Wno-sign-compare $OGG_CFLAGS $VORBIS_CFLAGS $AVILIB_CFLAGS $DEBUG_CFLAGS $PROFILING_CFLAGS" AC_OUTPUT(Makefile avilib/Makefile) From: Marc Leeman Date: Thu, 1 Sep 2016 13:34:08 +0200 Subject: ogmsplit.1: spell correct --- ogmsplit.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogmsplit.1 b/ogmsplit.1 index ef1dc5e..bc8f4c0 100644 --- a/ogmsplit.1 +++ b/ogmsplit.1 @@ -1,6 +1,6 @@ .TH OGMSPLIT "1" "November 2004" "ogmsplit v1.5" "User Commands" .SH NAME -ogmsplit \- Split OGG/OGM files into sevaral smaller OGG/OGM files +ogmsplit \- Split OGG/OGM files into several smaller OGG/OGM files .SH SYNOPSIS .B ogmsplit [\fIoptions\fR] \fIinname\fR From: Marc Leeman Date: Thu, 1 Sep 2016 13:34:48 +0200 Subject: ogmmerge: spell correct --- ogmmerge.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogmmerge.1 b/ogmmerge.1 index acd2c94..495d2a4 100644 --- a/ogmmerge.1 +++ b/ogmmerge.1 @@ -126,7 +126,7 @@ After a couple of minutes you can join video and audio: .LP $ \fBogmmerge -o MyMovie-with-sound.ogm MyMovie.avi MyMovie.ogg\fP .LP -If your AVI already contains an audio track then it will be copied aswell +If your AVI already contains an audio track then it will be copied as well (if \fBogmmerge\fR supports the audio format). To avoid that simply do .LP $ \fBogmmerge -o MyMovie-with-sound.ogm -A MyMovie.avi MyMovie.ogg\fP From: Marc Leeman Date: Thu, 1 Sep 2016 13:45:24 +0200 Subject: ogminfo: timestamp correction --- ogminfo.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/ogminfo.c b/ogminfo.c index a17b8cf..ca5f734 100644 --- a/ogminfo.c +++ b/ogminfo.c @@ -51,7 +51,7 @@ ogg_int64_t pagebytesread = 0; void add_stream(stream_t *ndmx) { stream_t *cur = first; - + if (first == NULL) { first = ndmx; first->next = NULL; @@ -66,13 +66,13 @@ void add_stream(stream_t *ndmx) { stream_t *find_stream(int fserial) { stream_t *cur = first; - + while (cur != NULL) { if (cur->serial == fserial) break; cur = cur->next; } - + return cur; } @@ -92,7 +92,7 @@ void usage(char *fname) { " -V, --version Show version information.\n", fname); } -#ifndef XIPHCORRECTINTERLEAVING +#ifndef XIPHCORRECTINTERLEAVING #define OUTOFSYNC ((((stream->stype == 't' ? end_pts : start_pts) \ - last_pts) < 0.0 ) ? "OUT_OF_SYNC " : "sync_ok ") #else @@ -131,7 +131,7 @@ void dump_streamheader(stream_header *sth, char stype, int sno, int snum) { int all_header_packets_dumped() { stream_t *stream = first; - + while (stream != NULL) { if ((stream->stype == 'V') && (stream->header_packets < 3)) return 0; @@ -139,7 +139,7 @@ int all_header_packets_dumped() { return 0; stream = stream->next; } - + return 1; } @@ -172,7 +172,7 @@ void handle_packet(stream_t *stream, ogg_packet *pack, ogg_page *page) { vorbis_comment_init(&vc); if (vorbis_unpack_comment(&vc, pack->packet, pack->bytes) != 0) fprintf(stdout, "(%s) %c%d: comment packet, length %ld. This packet " - "does NOT contain a valid Vorbis comment packet!\n", + "does NOT contain a valid Vorbis comment packet!\n", __FILE__, stream->stype, stream->sno, pack->bytes); else { fprintf(stdout, "(%s) %c%d: comment packet, length %ld,", __FILE__, @@ -194,9 +194,9 @@ void handle_packet(stream_t *stream, ogg_packet *pack, ogg_page *page) { __FILE__, stream->sno, pack->bytes, ogg_page_granulepos(page), pack->packetno); if (check_timing && (stream->sample_rate != -1)) { - end_pts = (double)ogg_page_granulepos(page) * + end_pts = (double)ogg_page_granulepos(page) * (double)1000.0 / (double)stream->sample_rate; - start_pts = (double)stream->last_granulepos * + start_pts = (double)stream->last_granulepos * (double)1000.0 / (double)stream->sample_rate; fprintf(stdout, " start: % 13.2fms end: % 13.2fms %s", start_pts, end_pts, OUTOFSYNC); @@ -224,9 +224,9 @@ void handle_packet(stream_t *stream, ogg_packet *pack, ogg_page *page) { "10lld ", __FILE__, stream->stype, stream->sno, n, ogg_page_granulepos(page), pack->packetno); if (check_timing && (stream->sample_rate != -1)) { - end_pts = (double)ogg_page_granulepos(page) * + end_pts = (double)ogg_page_granulepos(page) * (double)1000.0 / (double)stream->sample_rate; - start_pts = (double)stream->last_granulepos * + start_pts = (double)stream->last_granulepos * (double)1000.0 / (double)stream->sample_rate; fprintf(stdout, " start: % 13.2fms end: % 13.2fms %s", start_pts, end_pts, OUTOFSYNC); @@ -344,8 +344,8 @@ void process_ogm(int fdin) copy_headers(&sth, (old_stream_header *)&pack.packet[1], pack.bytes); if (!strncmp(sth.streamtype, "video", 5)) { unsigned long codec; - codec = (sth.subtype[0] << 24) + - (sth.subtype[1] << 16) + (sth.subtype[2] << 8) + sth.subtype[3]; + codec = (sth.subtype[0] << 24) + + (sth.subtype[1] << 16) + (sth.subtype[2] << 8) + sth.subtype[3]; fprintf(stdout, "(%s) (v%d/serial %d) fps: %.3f width height: %dx%d " "codec: %p (%c%c%c%c)\n", __FILE__, nvstreams + 1, serialnumber, (double)10000000 / @@ -450,7 +450,7 @@ void process_ogm(int fdin) numstreams++; } } - + if ((verbose == 0) && !summary) exit(0); @@ -500,7 +500,7 @@ void process_ogm(int fdin) } pagebytesread += pageseek; } - + if (summary) { stream = first; while (stream != NULL) { @@ -513,7 +513,7 @@ void process_ogm(int fdin) stream->serial, stream->size, (stream->size * 8.0 / 1000.0) / now, (stream->size / 1024.0) / now, - stream->num_packets, now * 1000.0); + stream->num_packets, now); stream = stream->next; } } @@ -521,7 +521,7 @@ void process_ogm(int fdin) int main(int argc, char *argv[]) { int i, fdin = -1; - + nice(2); for (i = 1; i < argc; i++) @@ -552,11 +552,11 @@ int main(int argc, char *argv[]) { usage(argv[0]); exit(1); } - + if (verbose >= 2) summary = 1; - process_ogm(fdin); - + process_ogm(fdin); + close(fdin); return 0; } From: Marc Leeman Date: Thu, 1 Sep 2016 13:46:50 +0200 Subject: ogminfo: increase verbosity --- ogminfo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogminfo.c b/ogminfo.c index ca5f734..8294e83 100644 --- a/ogminfo.c +++ b/ogminfo.c @@ -188,7 +188,7 @@ void handle_packet(stream_t *stream, ogg_packet *pack, ogg_page *page) { } vorbis_comment_clear(&vc); } else if ((stream->stype == 'a') && stream->vorbis) { - if (verbose < 1) + if (verbose < 2) return; fprintf(stdout, "(%s) a%d: % 7ld bytes granulepos: % 10lld pno: % 10lld ", __FILE__, stream->sno, pack->bytes, ogg_page_granulepos(page), Description: Don't ignore provided CFLAGS/CXXFLAGS Author: Adrian Bunk --- ogmtools-1.5.orig/configure.in +++ ogmtools-1.5/configure.in @@ -31,7 +31,7 @@ fi dnl Check for headers AC_HEADER_STDC() -CFLAGS="-Wall -Wno-sign-compare $OGG_CFLAGS $VORBIS_CFLAGS $AVILIB_CFLAGS $DEBUG_CFLAGS $PROFILING_CFLAGS" -CXXFLAGS="-Wall -Wno-sign-compare $OGG_CFLAGS $VORBIS_CFLAGS $AVILIB_CFLAGS $DEBUG_CFLAGS $PROFILING_CFLAGS" +CFLAGS="-Wall -Wno-sign-compare $OGG_CFLAGS $VORBIS_CFLAGS $AVILIB_CFLAGS $DEBUG_CFLAGS $PROFILING_CFLAGS $CFLAGS" +CXXFLAGS="-Wall -Wno-sign-compare $OGG_CFLAGS $VORBIS_CFLAGS $AVILIB_CFLAGS $DEBUG_CFLAGS $PROFILING_CFLAGS $CXXFLAGS" AC_OUTPUT(Makefile avilib/Makefile)