diff options
| author | James Zern <jzern@google.com> | 2015-09-24 00:33:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-24 00:33:16 +0000 |
| commit | af631e1f1959cf4961e1abeb7f547d6a9114fbcd (patch) | |
| tree | 174a6b6aa93ce73572aa743c710977b942e3780a | |
| parent | 30bd74cf74eb5abc69af9c27a9ee9d0b20863681 (diff) | |
| parent | 5404978825e174835932d9bf740e7538beb10898 (diff) | |
| download | libvpx-af631e1f1959cf4961e1abeb7f547d6a9114fbcd.tar libvpx-af631e1f1959cf4961e1abeb7f547d6a9114fbcd.tar.gz libvpx-af631e1f1959cf4961e1abeb7f547d6a9114fbcd.tar.bz2 libvpx-af631e1f1959cf4961e1abeb7f547d6a9114fbcd.zip | |
Merge "VP9: Remove frame_parallel_decoding_mode from macroblockd"
| -rw-r--r-- | vp9/common/vp9_blockd.h | 1 | ||||
| -rw-r--r-- | vp9/common/vp9_onyxc_int.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index c8ef3674a..5683736c6 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -176,7 +176,6 @@ typedef struct macroblockd { int mb_to_bottom_edge; FRAME_CONTEXT *fc; - int frame_parallel_decoding_mode; /* pointers to reference frames */ RefBuffer *block_refs[2]; diff --git a/vp9/common/vp9_onyxc_int.h b/vp9/common/vp9_onyxc_int.h index 5d8eb9069..61e731a1d 100644 --- a/vp9/common/vp9_onyxc_int.h +++ b/vp9/common/vp9_onyxc_int.h @@ -364,7 +364,6 @@ static INLINE void vp9_init_macroblockd(VP9_COMMON *cm, MACROBLOCKD *xd, memcpy(xd->plane[i].seg_dequant, cm->uv_dequant, sizeof(cm->uv_dequant)); } xd->fc = cm->fc; - xd->frame_parallel_decoding_mode = cm->frame_parallel_decoding_mode; } xd->above_seg_context = cm->above_seg_context; |