commit 6cd8e1771d9100a64785e46ee1e512b737743bff
author David Barker <david.barker@argondesign.com> Thu Jan 25 13:39:52 2018 +0000
committer David Barker <david.barker@argondesign.com> Fri Jan 26 10:47:53 2018 +0000
tree 393f8e3626fbadc502bc31a026531e3d4f21b9b7
parent e8d8879e40d53fa348b6bab7c8435596b6b5f6a4

Fix compile warning with mono-video disabled

The variable 'num_planes' is only used when mono-video is enabled,
so move it inside a #if CONFIG_MONO_VIDEO block

Change-Id: I415f764b2629478edde579142b7242851991b1c0

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 5066de1..9933049 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -3444,7 +3444,6 @@
                                     const uint8_t **p_data_end, int startTile,
                                     int endTile, int initialize_flag) {
   AV1_COMMON *const cm = &pbi->common;
-  const int num_planes = av1_num_planes(cm);
   MACROBLOCKD *const xd = &pbi->mb;
 
   if (initialize_flag) setup_frame_info(pbi);
@@ -3452,6 +3451,7 @@
   *p_data_end = decode_tiles(pbi, data, data_end, startTile, endTile);
 
 #if CONFIG_MONO_VIDEO
+  const int num_planes = av1_num_planes(cm);
   // If the bit stream is monochrome, set the U and V buffers to a constant.
   if (num_planes < 3) {
     const int bytes_per_sample = cm->use_highbitdepth ? 2 : 1;