Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
5616daf9
Commit
5616daf9
authored
Jun 13, 2013
by
Frank Galligan
Committed by
Gerrit Code Review
Jun 13, 2013
Browse files
Merge "Fix win64 warning."
parents
b36829a0
a136b871
Changes
2
Hide whitespace changes
Inline
Side-by-side
vp9/decoder/vp9_decodframe.c
View file @
5616daf9
...
...
@@ -973,7 +973,7 @@ static void check_sync_code(VP9_COMMON *cm, struct vp9_read_bit_buffer *rb) {
}
}
static
void
error_handler
(
void
*
data
,
in
t
bit_offset
)
{
static
void
error_handler
(
void
*
data
,
size_
t
bit_offset
)
{
VP9_COMMON
*
const
cm
=
(
VP9_COMMON
*
)
data
;
vpx_internal_error
(
&
cm
->
error
,
VPX_CODEC_CORRUPT_FRAME
,
"Truncated packet"
);
}
...
...
vp9/decoder/vp9_read_bit_buffer.h
View file @
5616daf9
...
...
@@ -15,7 +15,7 @@
#include
"vpx/vpx_integer.h"
typedef
void
(
*
vp9_rb_error_handler
)(
void
*
data
,
in
t
bit_offset
);
typedef
void
(
*
vp9_rb_error_handler
)(
void
*
data
,
size_
t
bit_offset
);
struct
vp9_read_bit_buffer
{
const
uint8_t
*
bit_buffer
;
...
...
@@ -31,9 +31,9 @@ static size_t vp9_rb_bytes_read(struct vp9_read_bit_buffer *rb) {
}
static
int
vp9_rb_read_bit
(
struct
vp9_read_bit_buffer
*
rb
)
{
const
in
t
off
=
rb
->
bit_offset
;
const
in
t
p
=
off
/
CHAR_BIT
;
const
int
q
=
CHAR_BIT
-
1
-
off
%
CHAR_BIT
;
const
size_
t
off
=
rb
->
bit_offset
;
const
size_
t
p
=
off
/
CHAR_BIT
;
const
int
q
=
CHAR_BIT
-
1
-
(
int
)
off
%
CHAR_BIT
;
if
(
rb
->
bit_buffer
+
p
>=
rb
->
bit_buffer_end
)
{
rb
->
error_handler
(
rb
->
error_handler_data
,
rb
->
bit_offset
);
return
0
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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