summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalph Giles <giles@xiph.org>2005-07-23 00:19:14 +0000
committerRalph Giles <giles@xiph.org>2005-07-23 00:19:14 +0000
commita4dba7c0734271587f946eab5d4b08b46d64a2b2 (patch)
tree12e40a766f48cc5cf7a6e16b255599b8f81dea79
parent641bb0342d8a319ea91fe66268c5f0e5d4435b00 (diff)
downloadogg-a4dba7c0734271587f946eab5d4b08b46d64a2b2.tar.gz
Correct the test case data to expect a granulepos of -1 on pages where
no packet ends. The spec is clear about this but the unit tests assumed the old behaviour (carry over the previous granulepos) was correct. I did not verify the new CRC values by hand however, they are just copied from the library output. Also update changelog for the bug fix. git-svn-id: http://svn.xiph.org/trunk/ogg@9601 0101bb08-14d6-0310-b084-bc0e0c8e3800
-rw-r--r--CHANGES4
-rw-r--r--src/framing.c8
2 files changed, 8 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 9c8a824..44d71aa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+Version 1.1.3 (unreleased)
+
+ * Correct a bug in the granulepos field of pages where no packet ends
+
Version 1.1.2 (2004 September 23)
* fix a bug with multipage packet assembly after seek
diff --git a/src/framing.c b/src/framing.c
index 73abfa4..e2c6f48 100644
--- a/src/framing.c
+++ b/src/framing.c
@@ -1079,9 +1079,9 @@ const int head1_4[] = {0x4f,0x67,0x67,0x53,0,0x02,
0};
const int head2_4[] = {0x4f,0x67,0x67,0x53,0,0x00,
- 0x07,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0x01,0x02,0x03,0x04,1,0,0,0,
- 0x34,0x24,0xd5,0x29,
+ 0x54,0x05,0x51,0xc8,
17,
255,255,255,255,255,255,255,255,
255,255,255,255,255,255,255,255,255};
@@ -1165,9 +1165,9 @@ const int head2_6[] = {0x4f,0x67,0x67,0x53,0,0x00,
255,255,255,255,255,255,255,255};
const int head3_6[] = {0x4f,0x67,0x67,0x53,0,0x01,
- 0x07,0x04,0x00,0x00,0x00,0x00,0x00,0x00,
+ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,
0x01,0x02,0x03,0x04,2,0,0,0,
- 0xbd,0xd5,0xb5,0x8b,
+ 0x01,0xd2,0xe5,0xe5,
17,
255,255,255,255,255,255,255,255,
255,255,255,255,255,255,255,255,255};