Commit 7c82a74c authored by Austin Yuan's avatar Austin Yuan

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

parents efa8d7c8 d4c52c20
...@@ -656,6 +656,7 @@ typedef struct _VAPictureParameterBufferMPEG4 ...@@ -656,6 +656,7 @@ typedef struct _VAPictureParameterBufferMPEG4
unsigned int quarter_sample : 1; unsigned int quarter_sample : 1;
unsigned int data_partitioned : 1; unsigned int data_partitioned : 1;
unsigned int reversible_vlc : 1; unsigned int reversible_vlc : 1;
unsigned int resync_marker_disable : 1;
} bits; } bits;
unsigned int value; unsigned int value;
} vol_fields; } vol_fields;
...@@ -676,6 +677,7 @@ typedef struct _VAPictureParameterBufferMPEG4 ...@@ -676,6 +677,7 @@ typedef struct _VAPictureParameterBufferMPEG4
} vop_fields; } vop_fields;
unsigned char vop_fcode_forward; unsigned char vop_fcode_forward;
unsigned char vop_fcode_backward; unsigned char vop_fcode_backward;
unsigned short vop_time_increment_resolution;
/* short header related */ /* short header related */
unsigned char num_gobs_in_vop; unsigned char num_gobs_in_vop;
unsigned char num_macroblocks_in_gob; unsigned char num_macroblocks_in_gob;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment