[svn] / branches / dev-api-4 / xvidcore / src / encoder.c Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/src/encoder.c

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

revision 1282, Fri Dec 19 10:55:58 2003 UTC revision 1283, Fri Dec 19 11:16:51 2003 UTC
# Line 21  Line 21 
21   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
22   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
23   *   *
24   * $Id: encoder.c,v 1.95.2.60 2003-12-19 10:55:58 syskin Exp $   * $Id: encoder.c,v 1.95.2.61 2003-12-19 11:16:51 syskin Exp $
25   *   *
26   ****************************************************************************/   ****************************************************************************/
27    
# Line 1121  Line 1121 
1121    
1122          pEnc->current->fincr = pEnc->mbParam.fincr>0 ? pEnc->mbParam.fincr : frame->fincr;          pEnc->current->fincr = pEnc->mbParam.fincr>0 ? pEnc->mbParam.fincr : frame->fincr;
1123          inc_frame_num(pEnc);          inc_frame_num(pEnc);
1124          pEnc->current->vol_flags = pEnc->mbParam.vol_flags;          pEnc->current->vol_flags = frame->vol_flags;
1125          pEnc->current->vop_flags = frame->vop_flags;          pEnc->current->vop_flags = frame->vop_flags;
1126          pEnc->current->motion_flags = frame->motion;          pEnc->current->motion_flags = frame->motion;
1127          pEnc->current->fcode = pEnc->mbParam.m_fcode;          pEnc->current->fcode = pEnc->mbParam.m_fcode;
# Line 1156  Line 1156 
1156                  }                  }
1157          }          }
1158    
1159            if (type != I_VOP)
1160                    pEnc->current->vol_flags = pEnc->mbParam.vol_flags; /* don't allow VOL changes here */
1161    
1162          /* bframes buffer overflow check */          /* bframes buffer overflow check */
1163          if (type == B_VOP && pEnc->bframenum_tail >= pEnc->mbParam.max_bframes) {          if (type == B_VOP && pEnc->bframenum_tail >= pEnc->mbParam.max_bframes) {
1164                  type = P_VOP;                  type = P_VOP;

Legend:
Removed from v.1282  
changed lines
  Added in v.1283

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4