commit 7c82a74c676b8149049b352a398abe7db5a51be4
author Austin Yuan <shengquan.yuan@intel.com> Thu Dec 17 10:57:13 2009 +0800
committer Austin Yuan <shengquan.yuan@intel.com> Thu Dec 17 10:57:13 2009 +0800
tree 8138c015073fa74b3c7159769fe26f5c265dc0be
parent efa8d7c8a299ce06ef5b4b449a1a791447f27448
parent d4c52c202bb95a092e22ef12b3ed5e3b1e0b7925

Merge branch 'master' of git+ssh://AustinYuan@git.freedesktop.org/git/libva into sync-fdo-master

src/va.h

diff --git a/src/va.h b/src/va.h
index 525e192..0d4c853 100755
--- a/src/va.h
+++ b/src/va.h
@@ -656,6 +656,7 @@
             unsigned int quarter_sample			: 1; 
             unsigned int data_partitioned		: 1; 
             unsigned int reversible_vlc			: 1; 
+            unsigned int resync_marker_disable		: 1; 
         } bits;
         unsigned int value;
     } vol_fields;
@@ -676,6 +677,7 @@
     } vop_fields;
     unsigned char vop_fcode_forward;
     unsigned char vop_fcode_backward;
+    unsigned short vop_time_increment_resolution;
     /* short header related */
     unsigned char num_gobs_in_vop;
     unsigned char num_macroblocks_in_gob;