diff options
| author | Johann <johannkoenig@google.com> | 2015-01-23 08:42:02 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-01-23 08:42:02 -0800 |
| commit | a18da9760a74d9ce6fb9f875706dc639c95402f5 (patch) | |
| tree | c2806c233776eb3bcb57f3d37d7202358c585143 /vp9/decoder/vp9_decodemv.h | |
| parent | bde04ce5039cbcf86c8b34bdb4127e18d7e1d0c7 (diff) | |
| download | libvpx-a18da9760a74d9ce6fb9f875706dc639c95402f5.tar libvpx-a18da9760a74d9ce6fb9f875706dc639c95402f5.tar.gz libvpx-a18da9760a74d9ce6fb9f875706dc639c95402f5.tar.bz2 libvpx-a18da9760a74d9ce6fb9f875706dc639c95402f5.zip | |
Revert "Merge branch 'frame-parallel' to enable frame parallel decode in master branch."
This reverts commit bde04ce5039cbcf86c8b34bdb4127e18d7e1d0c7
Change-Id: I053dae04c761b04a36dc239558503905a14d2470
Diffstat (limited to 'vp9/decoder/vp9_decodemv.h')
| -rw-r--r-- | vp9/decoder/vp9_decodemv.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vp9/decoder/vp9_decodemv.h b/vp9/decoder/vp9_decodemv.h index dd97d8da0..7394b62b4 100644 --- a/vp9/decoder/vp9_decodemv.h +++ b/vp9/decoder/vp9_decodemv.h @@ -11,7 +11,6 @@ #ifndef VP9_DECODER_VP9_DECODEMV_H_ #define VP9_DECODER_VP9_DECODEMV_H_ -#include "vp9/decoder/vp9_decoder.h" #include "vp9/decoder/vp9_reader.h" #ifdef __cplusplus @@ -20,7 +19,7 @@ extern "C" { struct TileInfo; -void vp9_read_mode_info(VP9Decoder *const pbi, MACROBLOCKD *xd, +void vp9_read_mode_info(VP9_COMMON *cm, MACROBLOCKD *xd, const struct TileInfo *const tile, int mi_row, int mi_col, vp9_reader *r); |