From: Wei-ting Lin <weitinglin@google.com>
Date: Tue, 19 Jul 2016 04:28:07 +0000 (+0000)
Subject: Merge "Allow OVERLAY frames to use the show_exsiting_frame flag" into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c13124e9b52bee8e721ae4b6ec897c4d06bb751;p=libvpx

Merge "Allow OVERLAY frames to use the show_exsiting_frame flag" into nextgenv2
---

3c13124e9b52bee8e721ae4b6ec897c4d06bb751
diff --cc vp10/encoder/encoder.h
index 5b07c3951,c8555f267..63a1669f8
--- a/vp10/encoder/encoder.h
+++ b/vp10/encoder/encoder.h
@@@ -614,10 -614,8 +614,11 @@@ typedef struct VP10_COMP 
  #if CONFIG_EXT_REFS
    int refresh_frame_mask;
    int existing_fb_idx_to_show;
+   int is_arf_filter_off;
  #endif  // CONFIG_EXT_REFS
 +#if CONFIG_GLOBAL_MOTION
 +  int global_motion_used[MAX_REF_FRAMES];
 +#endif
  } VP10_COMP;
  
  void vp10_initialize_enc(void);