--- branches/dev-api-4/xvidcore/dshow/src/CXvidDecoder.cpp 2004/01/26 03:16:53 1333 +++ branches/dev-api-4/xvidcore/dshow/src/CXvidDecoder.cpp 2004/01/26 05:49:42 1334 @@ -19,7 +19,7 @@ * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: CXvidDecoder.cpp,v 1.1.2.11 2004-01-21 04:26:21 syskin Exp $ + * $Id: CXvidDecoder.cpp,v 1.1.2.12 2004-01-26 05:49:42 syskin Exp $ * ****************************************************************************/ @@ -252,11 +252,12 @@ // Set the default post-processing settings REG_GET_N("Brightness", PPSettings.nBrightness, 25) - REG_GET_N("Deblock_Y", PPSettings.bDeblock_Y, 0) - REG_GET_N("Deblock_UV", PPSettings.bDeblock_UV, 0) - REG_GET_N("Dering", PPSettings.bDering, 0) - REG_GET_N("FilmEffect", PPSettings.bFilmEffect, 0) + REG_GET_N("Deblock_Y", PPSettings.nDeblock_Y, 0) + REG_GET_N("Deblock_UV", PPSettings.nDeblock_UV, 0) + REG_GET_N("Dering", PPSettings.nDering, 0) + REG_GET_N("FilmEffect", PPSettings.nFilmEffect, 0) REG_GET_N("ForceColorspace", PPSettings.nForceColorspace, 0) + REG_GET_N("FlipVideo", PPSettings.nFlipVideo, 0) RegCloseKey(hKey); @@ -704,20 +705,20 @@ if (pIn->IsDiscontinuity() == S_OK) m_frame.general = XVID_DISCONTINUITY; - if (PPSettings.bDeblock_Y) + if (PPSettings.nDeblock_Y) m_frame.general |= XVID_DEBLOCKY; - if (PPSettings.bDeblock_UV) + if (PPSettings.nDeblock_UV) m_frame.general |= XVID_DEBLOCKUV; /* - if (PPSettings.bDering) + if (PPSettings.nDering) m_frame.general |= XVID_DERING; */ - if (PPSettings.bFilmEffect) + if (PPSettings.nFilmEffect) m_frame.general |= XVID_FILMEFFECT; m_frame.output.csp &= ~XVID_CSP_VFLIP; - m_frame.output.csp |= rgb_flip^(PPSettings.bFlipVideo ? XVID_CSP_VFLIP : 0); + m_frame.output.csp |= rgb_flip^(PPSettings.nFlipVideo ? XVID_CSP_VFLIP : 0); repeat :