ref: 33aeb84c3f212d4b1bd6aa3bfe47e96ac8875397
parent: 06496d5508a1773492f2b063e4c53d0ff1fe731c
parent: 69544cfe40c6e89bccdfffc37688e1f1016bd457
author: Paul Wilkins <paulwilkins@google.com>
date: Wed May 14 22:39:14 EDT 2014
Merge "Clear unused parameter warning."
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -2777,6 +2777,9 @@
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 @@
#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 @@
} else {
ret = -1;
}
-
#endif // !CONFIG_VP9_POSTPROC
vp9_clear_system_state();
return ret;
--
⑨