[svn] / trunk / xvidcore / src / bitstream / bitstream.c Repository:
ViewVC logotype

Diff of /trunk/xvidcore/src/bitstream/bitstream.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1988, Wed May 18 09:10:05 2011 UTC revision 2170, Thu Jan 17 14:22:17 2019 UTC
# Line 129  Line 129 
129                  }                  }
130          }          }
131    
132          mbnum = BitstreamGetBits(bs, mbnum_bits);               /* macroblock_number */          mbnum = (mbnum_bits == 0) ? 0 : BitstreamGetBits(bs, mbnum_bits);               /* macroblock_number */
133          DPRINTF(XVID_DEBUG_HEADER, "mbnum %i\n", mbnum);          DPRINTF(XVID_DEBUG_HEADER, "mbnum %i\n", mbnum);
134    
135          if (dec->shape != VIDOBJLAY_SHAPE_BINARY_ONLY)          if (dec->shape != VIDOBJLAY_SHAPE_BINARY_ONLY)
# Line 153  Line 153 
153                  READ_MARKER();                  READ_MARKER();
154                  if (dec->time_inc_bits)                  if (dec->time_inc_bits)
155                          time_increment = (BitstreamGetBits(bs, dec->time_inc_bits));    /* vop_time_increment */                          time_increment = (BitstreamGetBits(bs, dec->time_inc_bits));    /* vop_time_increment */
156                    else
157                            time_increment = 0;
158                  READ_MARKER();                  READ_MARKER();
159                  DPRINTF(XVID_DEBUG_HEADER,"time %i:%i\n", time_base, time_increment);                  DPRINTF(XVID_DEBUG_HEADER,"time %i:%i\n", time_base, time_increment);
160    
# Line 860  Line 862 
862                                  dec->shape == VIDOBJLAY_SHAPE_RECTANGULAR &&                                  dec->shape == VIDOBJLAY_SHAPE_RECTANGULAR &&
863                                  (coding_type == P_VOP || coding_type == I_VOP)) {                                  (coding_type == P_VOP || coding_type == I_VOP)) {
864    
865                                  if (BitstreamGetBit(bs));                                  if (BitstreamGetBit(bs)) {
866                                          DPRINTF(XVID_DEBUG_ERROR, "RRV not supported (anymore)\n");                                          DPRINTF(XVID_DEBUG_ERROR, "RRV not supported (anymore)\n");
867                          }                          }
868                            }
869    
870                          if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) {                          if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) {
871                                  if(!(dec->sprite_enable == SPRITE_STATIC && coding_type == I_VOP)) {                                  if(!(dec->sprite_enable == SPRITE_STATIC && coding_type == I_VOP)) {
Legend:
Removed from v.1988  
changed lines
  Added in v.2170
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4