Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
6eb8c11d
Commit
6eb8c11d
authored
Oct 30, 2019
by
Jonathan Mannancheril
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update libogg to upstream c8fca6b
parent
d482a1d8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
91 additions
and
113 deletions
+91
-113
README.md
thirdparty/README.md
+1
-1
bitwise.c
thirdparty/libogg/bitwise.c
+2
-3
crctable.h
thirdparty/libogg/crctable.h
+0
-0
framing.c
thirdparty/libogg/framing.c
+72
-103
config_types.h
thirdparty/libogg/ogg/config_types.h
+1
-0
ogg.h
thirdparty/libogg/ogg/ogg.h
+0
-1
os_types.h
thirdparty/libogg/ogg/os_types.h
+15
-5
No files found.
thirdparty/README.md
View file @
6eb8c11d
...
@@ -157,7 +157,7 @@ Files extracted from upstream source:
...
@@ -157,7 +157,7 @@ Files extracted from upstream source:
## libogg
## libogg
-
Upstream: https://www.xiph.org/ogg
-
Upstream: https://www.xiph.org/ogg
-
Version:
1.3.3
-
Version:
git (c8fca6b, 2019)
-
License: BSD-3-Clause
-
License: BSD-3-Clause
Files extracted from upstream source:
Files extracted from upstream source:
...
...
thirdparty/libogg/bitwise.c
View file @
6eb8c11d
...
@@ -11,7 +11,6 @@
...
@@ -11,7 +11,6 @@
********************************************************************
********************************************************************
function: packing variable sized words into an octet stream
function: packing variable sized words into an octet stream
last mod: $Id$
********************************************************************/
********************************************************************/
...
@@ -890,7 +889,7 @@ int main(void){
...
@@ -890,7 +889,7 @@ int main(void){
for
(
i
=
0
;
i
<
test2size
;
i
++
){
for
(
i
=
0
;
i
<
test2size
;
i
++
){
if
(
oggpack_look
(
&
r
,
32
)
==-
1
)
report
(
"out of data. failed!"
);
if
(
oggpack_look
(
&
r
,
32
)
==-
1
)
report
(
"out of data. failed!"
);
if
(
oggpack_look
(
&
r
,
32
)
!=
large
[
i
]){
if
(
oggpack_look
(
&
r
,
32
)
!=
large
[
i
]){
fprintf
(
stderr
,
"%ld != %l
d
(%lx!=%lx):"
,
oggpack_look
(
&
r
,
32
),
large
[
i
],
fprintf
(
stderr
,
"%ld != %l
u
(%lx!=%lx):"
,
oggpack_look
(
&
r
,
32
),
large
[
i
],
oggpack_look
(
&
r
,
32
),
large
[
i
]);
oggpack_look
(
&
r
,
32
),
large
[
i
]);
report
(
"read incorrect value!
\n
"
);
report
(
"read incorrect value!
\n
"
);
}
}
...
@@ -1000,7 +999,7 @@ int main(void){
...
@@ -1000,7 +999,7 @@ int main(void){
for
(
i
=
0
;
i
<
test2size
;
i
++
){
for
(
i
=
0
;
i
<
test2size
;
i
++
){
if
(
oggpackB_look
(
&
r
,
32
)
==-
1
)
report
(
"out of data. failed!"
);
if
(
oggpackB_look
(
&
r
,
32
)
==-
1
)
report
(
"out of data. failed!"
);
if
(
oggpackB_look
(
&
r
,
32
)
!=
large
[
i
]){
if
(
oggpackB_look
(
&
r
,
32
)
!=
large
[
i
]){
fprintf
(
stderr
,
"%ld != %l
d
(%lx!=%lx):"
,
oggpackB_look
(
&
r
,
32
),
large
[
i
],
fprintf
(
stderr
,
"%ld != %l
u
(%lx!=%lx):"
,
oggpackB_look
(
&
r
,
32
),
large
[
i
],
oggpackB_look
(
&
r
,
32
),
large
[
i
]);
oggpackB_look
(
&
r
,
32
),
large
[
i
]);
report
(
"read incorrect value!
\n
"
);
report
(
"read incorrect value!
\n
"
);
}
}
...
...
thirdparty/libogg/crctable.h
0 → 100644
View file @
6eb8c11d
This diff is collapsed.
Click to expand it.
thirdparty/libogg/framing.c
View file @
6eb8c11d
This diff is collapsed.
Click to expand it.
thirdparty/libogg/ogg/config_types.h
View file @
6eb8c11d
...
@@ -8,5 +8,6 @@ typedef uint16_t ogg_uint16_t;
...
@@ -8,5 +8,6 @@ typedef uint16_t ogg_uint16_t;
typedef
int32_t
ogg_int32_t
;
typedef
int32_t
ogg_int32_t
;
typedef
uint32_t
ogg_uint32_t
;
typedef
uint32_t
ogg_uint32_t
;
typedef
int64_t
ogg_int64_t
;
typedef
int64_t
ogg_int64_t
;
typedef
uint64_t
ogg_uint64_t
;
#endif
#endif
thirdparty/libogg/ogg/ogg.h
View file @
6eb8c11d
...
@@ -11,7 +11,6 @@
...
@@ -11,7 +11,6 @@
********************************************************************
********************************************************************
function: toplevel libogg include
function: toplevel libogg include
last mod: $Id$
********************************************************************/
********************************************************************/
#ifndef _OGG_H
#ifndef _OGG_H
...
...
thirdparty/libogg/ogg/os_types.h
View file @
6eb8c11d
...
@@ -10,8 +10,7 @@
...
@@ -10,8 +10,7 @@
* *
* *
********************************************************************
********************************************************************
function: #ifdef jail to whip a few platforms into the UNIX ideal.
function: Define a consistent set of types on each platform.
last mod: $Id$
********************************************************************/
********************************************************************/
#ifndef _OS_TYPES_H
#ifndef _OS_TYPES_H
...
@@ -44,6 +43,7 @@
...
@@ -44,6 +43,7 @@
typedef
unsigned
long
long
ogg_uint64_t
;
typedef
unsigned
long
long
ogg_uint64_t
;
# elif defined(__MWERKS__)
# elif defined(__MWERKS__)
typedef
long
long
ogg_int64_t
;
typedef
long
long
ogg_int64_t
;
typedef
unsigned
long
long
ogg_uint64_t
;
typedef
int
ogg_int32_t
;
typedef
int
ogg_int32_t
;
typedef
unsigned
int
ogg_uint32_t
;
typedef
unsigned
int
ogg_uint32_t
;
typedef
short
ogg_int16_t
;
typedef
short
ogg_int16_t
;
...
@@ -62,6 +62,7 @@
...
@@ -62,6 +62,7 @@
typedef
__int64
ogg_int64_t
;
typedef
__int64
ogg_int64_t
;
typedef
__int32
ogg_int32_t
;
typedef
__int32
ogg_int32_t
;
typedef
unsigned
__int32
ogg_uint32_t
;
typedef
unsigned
__int32
ogg_uint32_t
;
typedef
unsigned
__int64
ogg_uint64_t
;
typedef
__int16
ogg_int16_t
;
typedef
__int16
ogg_int16_t
;
typedef
unsigned
__int16
ogg_uint16_t
;
typedef
unsigned
__int16
ogg_uint16_t
;
# endif
# endif
...
@@ -69,12 +70,13 @@
...
@@ -69,12 +70,13 @@
#elif (defined(__APPLE__) && defined(__MACH__))
/* MacOS X Framework build */
#elif (defined(__APPLE__) && defined(__MACH__))
/* MacOS X Framework build */
# include <
int
types.h>
# include <
sys/
types.h>
typedef
int16_t
ogg_int16_t
;
typedef
int16_t
ogg_int16_t
;
typedef
uint16_t
ogg_uint16_t
;
typedef
u
_
int16_t
ogg_uint16_t
;
typedef
int32_t
ogg_int32_t
;
typedef
int32_t
ogg_int32_t
;
typedef
uint32_t
ogg_uint32_t
;
typedef
u
_
int32_t
ogg_uint32_t
;
typedef
int64_t
ogg_int64_t
;
typedef
int64_t
ogg_int64_t
;
typedef
u_int64_t
ogg_uint64_t
;
#elif defined(__HAIKU__)
#elif defined(__HAIKU__)
...
@@ -85,6 +87,7 @@
...
@@ -85,6 +87,7 @@
typedef
int
ogg_int32_t
;
typedef
int
ogg_int32_t
;
typedef
unsigned
int
ogg_uint32_t
;
typedef
unsigned
int
ogg_uint32_t
;
typedef
long
long
ogg_int64_t
;
typedef
long
long
ogg_int64_t
;
typedef
unsigned
long
long
ogg_uint64_t
;
#elif defined(__BEOS__)
#elif defined(__BEOS__)
...
@@ -95,6 +98,7 @@
...
@@ -95,6 +98,7 @@
typedef
int32_t
ogg_int32_t
;
typedef
int32_t
ogg_int32_t
;
typedef
uint32_t
ogg_uint32_t
;
typedef
uint32_t
ogg_uint32_t
;
typedef
int64_t
ogg_int64_t
;
typedef
int64_t
ogg_int64_t
;
typedef
uint64_t
ogg_uint64_t
;
#elif defined (__EMX__)
#elif defined (__EMX__)
...
@@ -104,6 +108,8 @@
...
@@ -104,6 +108,8 @@
typedef
int
ogg_int32_t
;
typedef
int
ogg_int32_t
;
typedef
unsigned
int
ogg_uint32_t
;
typedef
unsigned
int
ogg_uint32_t
;
typedef
long
long
ogg_int64_t
;
typedef
long
long
ogg_int64_t
;
typedef
unsigned
long
long
ogg_uint64_t
;
#elif defined (DJGPP)
#elif defined (DJGPP)
...
@@ -112,11 +118,13 @@
...
@@ -112,11 +118,13 @@
typedef
int
ogg_int32_t
;
typedef
int
ogg_int32_t
;
typedef
unsigned
int
ogg_uint32_t
;
typedef
unsigned
int
ogg_uint32_t
;
typedef
long
long
ogg_int64_t
;
typedef
long
long
ogg_int64_t
;
typedef
unsigned
long
long
ogg_uint64_t
;
#elif defined(R5900)
#elif defined(R5900)
/* PS2 EE */
/* PS2 EE */
typedef
long
ogg_int64_t
;
typedef
long
ogg_int64_t
;
typedef
unsigned
long
ogg_uint64_t
;
typedef
int
ogg_int32_t
;
typedef
int
ogg_int32_t
;
typedef
unsigned
ogg_uint32_t
;
typedef
unsigned
ogg_uint32_t
;
typedef
short
ogg_int16_t
;
typedef
short
ogg_int16_t
;
...
@@ -129,6 +137,7 @@
...
@@ -129,6 +137,7 @@
typedef
signed
int
ogg_int32_t
;
typedef
signed
int
ogg_int32_t
;
typedef
unsigned
int
ogg_uint32_t
;
typedef
unsigned
int
ogg_uint32_t
;
typedef
long
long
int
ogg_int64_t
;
typedef
long
long
int
ogg_int64_t
;
typedef
unsigned
long
long
int
ogg_uint64_t
;
#elif defined(__TMS320C6X__)
#elif defined(__TMS320C6X__)
...
@@ -138,6 +147,7 @@
...
@@ -138,6 +147,7 @@
typedef
signed
int
ogg_int32_t
;
typedef
signed
int
ogg_int32_t
;
typedef
unsigned
int
ogg_uint32_t
;
typedef
unsigned
int
ogg_uint32_t
;
typedef
long
long
int
ogg_int64_t
;
typedef
long
long
int
ogg_int64_t
;
typedef
unsigned
long
long
int
ogg_uint64_t
;
#else
#else
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment