generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Clear unused parameter warning."

Browse Source
This commit is contained in:
Paul Wilkins 2014-05-15 02:39:14 -07:00 committed by Gerrit Code Review
commit 33aeb84c3f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vp9/encoder/vp9_encoder.c
View File

@ -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;