commit a0ffd00bb6cfcdc52bc259727a7de1ce41ffe261
author The Android Automerger <android-build@google.com> Thu Jan 15 06:10:03 2015 -0800
committer The Android Automerger <android-build@google.com> Thu Jan 15 06:10:03 2015 -0800
tree 3208661204ab889b4632e1a2520b8b3bf973cd28
parent 72865c13a87d6e4ecb48a3bf3ea119451ff536ac
parent 2c1fc27cb4c458dae7260e3f3dc829839a85d252

merge in lmp-mr1-release history after reset to lmp-mr1-dev

va/va.h

diff --git a/va/va.h b/va/va.h
index e911be2..75a4bc0 100755
--- a/va/va.h
+++ b/va/va.h
@@ -2500,10 +2500,13 @@
 	unsigned char luma_log2_weight_denom;
 	unsigned char chroma_log2_weight_denom;
 	unsigned char cabac_init_idc;
-	unsigned char pic_order_cnt_lsb;
+        unsigned char reserved8bit;
 
-	unsigned char pic_parameter_set_id;
-	unsigned short idr_pic_id;
+        unsigned short pic_order_cnt_lsb;
+        unsigned short reserved16bit;
+
+        unsigned short idr_pic_id;
+        unsigned char pic_parameter_set_id;
 	unsigned char colour_plane_id;
 
 	char slice_alpha_c0_offset_div2;