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

1 files changed, 2 insertions, 0 deletions

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 @@ typedef struct _VAPictureParameterBufferMPEG4
             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 @@ typedef struct _VAPictureParameterBufferMPEG4
     } 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;