Merge "Deadline is not supported in VP9 decoder, removing it completely."

diff --cc vp9/decoder/vp9_decoder.c
index e1292c222dc41441142b1d8a17e94f0bf56fcf2c,80f0727c135382094f3fc7607ee0d079eb0ca9fb..8902f179df81d7f2164a0662b3b6dcfa509ec9bf
--- 1/vp9/decoder/vp9_decoder.c
--- 2/vp9/decoder/vp9_decoder.c
+++ b/vp9/decoder/vp9_decoder.c
@@@ -302,12 -299,8 +300,11 @@@ int vp9_receive_compressed_data(VP9Deco
  }
  
  int vp9_get_raw_frame(VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd,
-                       int64_t *time_stamp, int64_t *time_end_stamp,
                        vp9_ppflags_t *flags) {
    int ret = -1;
 +#if !CONFIG_VP9_POSTPROC
 +  (void)*flags;
 +#endif
  
    if (pbi->ready_for_new_data == 1)
      return ret;

diff --cc vp9/decoder/vp9_decoder.h
index 36fb7ea94bb8c8b1509ccc8c844aeb2fdae2575c,12014a782bf042fd80eaaa13020fe3474fa43273..1a5576e5a016ca43ef83b40d1bdd6b32133c1aea
--- 1/vp9/decoder/vp9_decoder.h
--- 2/vp9/decoder/vp9_decoder.h
+++ b/vp9/decoder/vp9_decoder.h
@@@ -62,13 -52,12 +61,10 @@@ typedef struct VP9Decoder 
    int inv_tile_order;
  } VP9Decoder;
  
 -void vp9_initialize_dec();
 -
  int vp9_receive_compressed_data(struct VP9Decoder *pbi,
-                                 size_t size, const uint8_t **dest,
-                                 int64_t time_stamp);
+                                 size_t size, const uint8_t **dest);
  
- int vp9_get_raw_frame(struct VP9Decoder *pbi,
-                       YV12_BUFFER_CONFIG *sd,
-                       int64_t *time_stamp, int64_t *time_end_stamp,
+ int vp9_get_raw_frame(struct VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd,
                        vp9_ppflags_t *flags);
  
  vpx_codec_err_t vp9_copy_reference_dec(struct VP9Decoder *pbi,

diff --cc vp9/vp9_dx_iface.c
Simple merge