summaryrefslogtreecommitdiff
path: root/vp9
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@google.com>2013-04-05 13:45:48 -0700
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2013-04-05 13:45:48 -0700
commitac28c3169ab160fab4aae26d86c749d2beec7f7c (patch)
treeece1c4d5e14373fde67a3ee8c2ed8117cc2f6e31 /vp9
parent2e23c74794cbbc467f801c6b883570625529d933 (diff)
parent5cd235c6cda17a68655e1dd02cf756800f6ccd44 (diff)
downloadlibvpx-ac28c3169ab160fab4aae26d86c749d2beec7f7c.tar
libvpx-ac28c3169ab160fab4aae26d86c749d2beec7f7c.tar.gz
libvpx-ac28c3169ab160fab4aae26d86c749d2beec7f7c.tar.bz2
libvpx-ac28c3169ab160fab4aae26d86c749d2beec7f7c.zip
Merge "Remove "tx_type" member from union b_mode_info." into experimental
Diffstat (limited to 'vp9')
-rw-r--r--vp9/common/vp9_blockd.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h
index 016244b0c..e28e146e7 100644
--- a/vp9/common/vp9_blockd.h
+++ b/vp9/common/vp9_blockd.h
@@ -192,7 +192,6 @@ typedef enum {
union b_mode_info {
struct {
B_PREDICTION_MODE first;
- TX_TYPE tx_type;
#if CONFIG_NEWBINTRAMODES
B_PREDICTION_MODE context;
#endif