[svn] / branches / release-0_9_1-fixes / xvidcore / src / encoder.c Repository:
ViewVC logotype

Diff of /branches/release-0_9_1-fixes/xvidcore/src/encoder.c

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

trunk/xvidcore/src/encoder.c revision 815, Tue Feb 4 22:00:44 2003 UTC branches/release-0_9_1-fixes/xvidcore/src/encoder.c revision 1098, Mon Jul 28 12:39:32 2003 UTC
# Line 52  Line 52 
52   *  exception also makes it possible to release a modified version which   *  exception also makes it possible to release a modified version which
53   *  carries forward this exception.   *  carries forward this exception.
54   *   *
55   * $Id: encoder.c,v 1.90 2003-02-04 22:00:44 edgomez Exp $   * $Id: encoder.c,v 1.90.2.3 2003-07-28 12:39:23 edgomez Exp $
56   *   *
57   ****************************************************************************/   ****************************************************************************/
58    
# Line 210  Line 210 
210          /* 1 keyframe each 10 seconds */          /* 1 keyframe each 10 seconds */
211    
212          if (pParam->max_key_interval <= 0)          if (pParam->max_key_interval <= 0)
213                  pParam->max_key_interval = 10 * pParam->fincr / pParam->fbase;                  pParam->max_key_interval = 10 * pParam->fbase / pParam->fincr;
214    
215          pEnc = (Encoder *) xvid_malloc(sizeof(Encoder), CACHE_LINE);          pEnc = (Encoder *) xvid_malloc(sizeof(Encoder), CACHE_LINE);
216          if (pEnc == NULL)          if (pEnc == NULL)
# Line 543  Line 543 
543    
544          }          }
545    
546          BitstreamPutBits(&bs, 0xFFFF, 16);          /* Fix from CVS_HEAD (2003-03-17)
547          BitstreamPutBits(&bs, 0xFFFF, 16);           *
548          BitstreamPad(&bs);           * Relic from OpenDivX - now disabled
549             *
550             * BitstreamPutBits(&bs, 0xFFFF, 16);
551             * BitstreamPutBits(&bs, 0xFFFF, 16);
552             */
553            BitstreamPadAlways(&bs); /* next_start_code() at the end of Video Object Plane */
554          pFrame->length = BitstreamLength(&bs);          pFrame->length = BitstreamLength(&bs);
555    
556          if (pResult) {          if (pResult) {
Legend:
Removed from v.815  
changed lines
  Added in v.1098
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4