From: Dmitry Kovalev <dkovalev@google.com>
Date: Wed, 21 May 2014 17:37:39 +0000 (-0700)
Subject: Merge "Deadline is not supported in VP9 decoder, removing it completely."
X-Git-Tag: v1.4.0~1526
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66ce10c13dee8d64f4249189df450e4b14cf9ca3;p=libvpx

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

66ce10c13dee8d64f4249189df450e4b14cf9ca3
diff --cc vp9/decoder/vp9_decoder.c
index e1292c222,80f0727c1..8902f179d
--- a/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 36fb7ea94,12014a782..1a5576e5a
--- a/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,