[xiph-cvs] cvs commit: vorbis-tools/ogginfo ogginfo2.c

[Ralph Giles]

giles       02/07/16 04:16:05

  Modified:    ogginfo  ogginfo2.c
  Log:
  Use packetpeek() to check that the third header finishes as page as per spec.
  Replaces the incorrect check with page_continued() removed in the previous commit.

Revision  Changes    Path
1.14      +1 -1      vorbis-tools/ogginfo/ogginfo2.c

Index: ogginfo2.c
===================================================================
RCS file: /usr/local/cvsroot/vorbis-tools/ogginfo/ogginfo2.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ogginfo2.c	2002/07/16 10:48:03	1.13
+++ ogginfo2.c	2002/07/16 11:16:05	1.14
@@ -160,7 +160,7 @@
             header = 1;
             inf->doneheaders++;
             if(inf->doneheaders == 3) {
-                if(ogg_page_granulepos(page) != 0)
+                if(ogg_page_granulepos(page) != 0 || ogg_stream_packetpeek(&stream->os, NULL) == 1)
                     warn(_("Warning: Vorbis stream %d does not have headers "
                            "correctly framed. Terminal header page contains "
                            "additional packets or has non-zero granulepos\n"),

<p><p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.