]> granicus.if.org Git - libvpx/commitdiff
Merge "Allow OVERLAY frames to use the show_exsiting_frame flag" into nextgenv2
authorWei-ting Lin <weitinglin@google.com>
Tue, 19 Jul 2016 04:28:07 +0000 (04:28 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 19 Jul 2016 04:28:08 +0000 (04:28 +0000)
1  2 
vp10/encoder/bitstream.c
vp10/encoder/encoder.h

Simple merge
index 5b07c39517de0eb0e9a7a7c753867e1265027dc3,c8555f26796e4e8e239a9548c834531bf3063a31..63a1669f80e0afc39f3bed8dae701cb648b4695b
@@@ -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);