[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 1928, Tue Dec 28 19:19:57 2010 UTC revision 2169, Thu Jan 17 14:19:40 2019 UTC
# Line 20  Line 20 
20   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
21   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
22   *   *
23   * $Id: bitstream.c,v 1.61 2010-12-28 19:19:43 Isibaar Exp $   * $Id$
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
# 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 860  Line 860 
860                                  dec->shape == VIDOBJLAY_SHAPE_RECTANGULAR &&                                  dec->shape == VIDOBJLAY_SHAPE_RECTANGULAR &&
861                                  (coding_type == P_VOP || coding_type == I_VOP)) {                                  (coding_type == P_VOP || coding_type == I_VOP)) {
862    
863                                  if (BitstreamGetBit(bs));                                  if (BitstreamGetBit(bs)) {
864                                          DPRINTF(XVID_DEBUG_ERROR, "RRV not supported (anymore)\n");                                          DPRINTF(XVID_DEBUG_ERROR, "RRV not supported (anymore)\n");
865                          }                          }
866                            }
867    
868                          if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) {                          if (dec->shape != VIDOBJLAY_SHAPE_RECTANGULAR) {
869                                  if(!(dec->sprite_enable == SPRITE_STATIC && coding_type == I_VOP)) {                                  if(!(dec->sprite_enable == SPRITE_STATIC && coding_type == I_VOP)) {
Legend:
Removed from v.1928  
changed lines
  Added in v.2169
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4