From a18da9760a74d9ce6fb9f875706dc639c95402f5 Mon Sep 17 00:00:00 2001 From: Johann Date: Fri, 23 Jan 2015 08:42:02 -0800 Subject: Revert "Merge branch 'frame-parallel' to enable frame parallel decode in master branch." This reverts commit bde04ce5039cbcf86c8b34bdb4127e18d7e1d0c7 Change-Id: I053dae04c761b04a36dc239558503905a14d2470 --- vp9/decoder/vp9_decodemv.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'vp9/decoder/vp9_decodemv.h') 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); -- cgit v1.2.3