diff options
| author | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-03-07 01:15:02 +0000 |
|---|---|---|
| committer | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-03-07 01:15:02 +0000 |
| commit | 9105f8efa7f24b914144670038451720487c9606 (patch) | |
| tree | a18906bc780759067a794879321e49f7047e163e /libmpeg2/header.c | |
| parent | 00adcf3a046ce692058bf8d1967ac9fcc06b74c7 (diff) | |
| download | mpv-9105f8efa7f24b914144670038451720487c9606.tar.bz2 mpv-9105f8efa7f24b914144670038451720487c9606.tar.xz | |
updated to libmpeg2-0.2.1-CVS
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@50 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpeg2/header.c')
| -rw-r--r-- | libmpeg2/header.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libmpeg2/header.c b/libmpeg2/header.c index 852ff541bd..dd29cb035e 100644 --- a/libmpeg2/header.c +++ b/libmpeg2/header.c @@ -177,10 +177,10 @@ static int header_process_quant_matrix_extension (picture_t * picture, static int header_process_picture_coding_extension (picture_t * picture, uint8_t * buffer) { /* pre subtract 1 for use later in compute_motion_vector */ - picture->f_code[0][0] = (buffer[0] & 15) - 1; - picture->f_code[0][1] = (buffer[1] >> 4) - 1; - picture->f_code[1][0] = (buffer[1] & 15) - 1; - picture->f_code[1][1] = (buffer[2] >> 4) - 1; + picture->f_motion.f_code[0] = (buffer[0] & 15) - 1; + picture->f_motion.f_code[1] = (buffer[1] >> 4) - 1; + picture->b_motion.f_code[0] = (buffer[1] & 15) - 1; + picture->b_motion.f_code[1] = (buffer[2] >> 4) - 1; picture->intra_dc_precision = (buffer[2] >> 2) & 3; picture->picture_structure = buffer[2] & 3; @@ -237,11 +237,11 @@ int header_process_picture_header (picture_t *picture, uint8_t * buffer) picture->picture_coding_type = (buffer [1] >> 3) & 7; /* forward_f_code and backward_f_code - used in mpeg1 only */ - picture->f_code[0][1] = (buffer[3] >> 2) & 1; - picture->f_code[0][0] = + picture->f_motion.f_code[1] = (buffer[3] >> 2) & 1; + picture->f_motion.f_code[0] = (((buffer[3] << 1) | (buffer[4] >> 7)) & 7) - 1; - picture->f_code[1][1] = (buffer[4] >> 6) & 1; - picture->f_code[1][0] = ((buffer[4] >> 3) & 7) - 1; + picture->b_motion.f_code[1] = (buffer[4] >> 6) & 1; + picture->b_motion.f_code[0] = ((buffer[4] >> 3) & 7) - 1; /* move in header_process_picture_header */ picture->second_field = |