Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
da464c48
Commit
da464c48
authored
Dec 05, 2014
by
James Zern
Committed by
Gerrit Code Review
Dec 05, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Merge "vp9 asserts: fix compile warning"
parents
0e00dbae
616b3a81
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_encodeframe.c
+4
-4
vp9/encoder/vp9_mcomp.c
vp9/encoder/vp9_mcomp.c
+1
-1
No files found.
vp9/encoder/vp9_encodeframe.c
View file @
da464c48
...
...
@@ -1164,7 +1164,7 @@ static void encode_sb(VP9_COMP *cpi, ThreadData *td,
}
break
;
default:
assert
(
"Invalid partition type."
);
assert
(
0
&&
"Invalid partition type."
);
break
;
}
...
...
@@ -1491,7 +1491,7 @@ static void encode_sb_rt(VP9_COMP *cpi, ThreadData *td,
output_enabled
,
subsize
,
pc_tree
->
split
[
3
]);
break
;
default:
assert
(
"Invalid partition type."
);
assert
(
0
&&
"Invalid partition type."
);
break
;
}
...
...
@@ -3156,7 +3156,7 @@ static void nonrd_select_partition(VP9_COMP *cpi,
}
break
;
default:
assert
(
"Invalid partition type."
);
assert
(
0
&&
"Invalid partition type."
);
break
;
}
}
...
...
@@ -3291,7 +3291,7 @@ static void nonrd_use_partition(VP9_COMP *cpi,
}
break
;
default:
assert
(
"Invalid partition type."
);
assert
(
0
&&
"Invalid partition type."
);
break
;
}
...
...
vp9/encoder/vp9_mcomp.c
View file @
da464c48
...
...
@@ -2142,7 +2142,7 @@ int vp9_full_pixel_search(VP9_COMP *cpi, MACROBLOCK *x,
1
,
cost_list
,
fn_ptr
,
ref_mv
,
tmp_mv
);
break
;
default:
assert
(
!
"Invalid search method."
);
assert
(
0
&&
"Invalid search method."
);
}
if
(
method
!=
NSTEP
&&
rd
&&
var
<
var_max
)
...
...
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