Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
33aeb84c
Commit
33aeb84c
authored
May 15, 2014
by
Paul Wilkins
Committed by
Gerrit Code Review
May 15, 2014
Browse files
Merge "Clear unused parameter warning."
parents
06496d55
69544cfe
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encoder.c
View file @
33aeb84c
...
...
@@ -2777,6 +2777,9 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
int
vp9_get_preview_raw_frame
(
VP9_COMP
*
cpi
,
YV12_BUFFER_CONFIG
*
dest
,
vp9_ppflags_t
*
flags
)
{
VP9_COMMON
*
cm
=
&
cpi
->
common
;
#if !CONFIG_VP9_POSTPROC
(
void
)
flags
;
#endif
if
(
!
cm
->
show_frame
)
{
return
-
1
;
...
...
@@ -2785,7 +2788,6 @@ int vp9_get_preview_raw_frame(VP9_COMP *cpi, YV12_BUFFER_CONFIG *dest,
#if CONFIG_VP9_POSTPROC
ret
=
vp9_post_proc_frame
(
cm
,
dest
,
flags
);
#else
if
(
cm
->
frame_to_show
)
{
*
dest
=
*
cm
->
frame_to_show
;
dest
->
y_width
=
cm
->
width
;
...
...
@@ -2796,7 +2798,6 @@ int vp9_get_preview_raw_frame(VP9_COMP *cpi, YV12_BUFFER_CONFIG *dest,
}
else
{
ret
=
-
1
;
}
#endif // !CONFIG_VP9_POSTPROC
vp9_clear_system_state
();
return
ret
;
...
...
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