From: Milan C. <mil...@us...> - 2004-04-30 18:56:10
|
Update of /cvsroot/ffdshow/ffdshow/src/convert In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13620/src/convert Modified Files: Tconvert.cpp Tconvert.h Log Message: init xvid colorspace conversion only once Index: Tconvert.cpp =================================================================== RCS file: /cvsroot/ffdshow/ffdshow/src/convert/Tconvert.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** Tconvert.cpp 30 Mar 2004 09:49:12 -0000 1.18 --- Tconvert.cpp 30 Apr 2004 18:55:58 -0000 1.19 *************** *** 19,22 **** --- 19,23 ---- #include "stdafx.h" #include "IffdshowBase.h" + #include "ffdshow_constants.h" #include "Tconfig.h" #include "Tconvert.h" *************** *** 40,44 **** swscale=NULL; oldincsp=oldoutcsp=-1;incspInfo=outcspInfo=NULL; ! initsws=true;xvidInited=false; tmp[0]=tmp[1]=tmp[2]=NULL; tmpConvert1=tmpConvert2=NULL; --- 41,45 ---- swscale=NULL; oldincsp=oldoutcsp=-1;incspInfo=outcspInfo=NULL; ! initsws=true; tmp[0]=tmp[1]=tmp[2]=NULL; tmpConvert1=tmpConvert2=NULL; *************** *** 135,141 **** */ ! if (!xvidInited) { ! xvidInited=true; xvid_colorspace_init(Tconfig::cpu_flags); } --- 136,142 ---- */ ! if (!deci->getParam2(IDFF_xvidInited)) { ! deci->putParam(IDFF_xvidInited,1); xvid_colorspace_init(Tconfig::cpu_flags); } Index: Tconvert.h =================================================================== RCS file: /cvsroot/ffdshow/ffdshow/src/convert/Tconvert.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Tconvert.h 11 Mar 2004 14:16:03 -0000 1.10 --- Tconvert.h 30 Apr 2004 18:55:58 -0000 1.11 *************** *** 13,17 **** Tlibmplayer *libmplayer; Tswscale *swscale;bool initsws; - bool xvidInited; int oldincsp,oldoutcsp; int incsp1,outcsp1; --- 13,16 ---- |