[cvs] / xvidcore / dshow / src / CXvidDecoder.cpp Repository:
ViewVC logotype

Diff of /xvidcore/dshow/src/CXvidDecoder.cpp

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

revision 1.23, Fri Oct 29 16:39:07 2010 UTC revision 1.24, Sat Dec 18 10:16:46 2010 UTC
# Line 24  Line 24 
24   *   *
25   ****************************************************************************/   ****************************************************************************/
26    
 /****************************************************************************  
  *  
  * 2003/12/11 - added some additional options, mainly to make the deblocking  
  *              code from xvidcore available. Most of the new code is taken  
  *              from Nic's dshow filter, (C) Nic, http://nic.dnsalias.com  
  *  
  ****************************************************************************/  
   
27   /*   /*
28          this requires the directx sdk          this requires the directx sdk
29          place these paths at the top of the Tools|Options|Directories list          place these paths at the top of the Tools|Options|Directories list
# Line 339  Line 331 
331          memset(&init, 0, sizeof(init));          memset(&init, 0, sizeof(init));
332          init.version = XVID_VERSION;          init.version = XVID_VERSION;
333    
334            xvid_gbl_info_t info;
335            memset(&info, 0, sizeof(info));
336            info.version = XVID_VERSION;
337    
338          m_hdll = LoadLibrary(XVID_DLL_NAME);          m_hdll = LoadLibrary(XVID_DLL_NAME);
339          if (m_hdll == NULL) {          if (m_hdll == NULL) {
340                  DPRINTF("dll load failed");                  DPRINTF("dll load failed");
# Line 373  Line 369 
369                  return E_FAIL;                  return E_FAIL;
370          }          }
371    
372            if (xvid_global_func(0, XVID_GBL_INFO, &info, NULL) < 0)
373            {
374            xvid_global_func = NULL;
375            xvid_decore_func = NULL;
376            FreeLibrary(m_hdll);
377            m_hdll = NULL;
378                    MessageBox(0, "xvid_global() failed", "Error", MB_TOPMOST);
379                    return E_FAIL;
380            }
381    
382          memset(&m_create, 0, sizeof(m_create));          memset(&m_create, 0, sizeof(m_create));
383          m_create.version = XVID_VERSION;          m_create.version = XVID_VERSION;
384          m_create.handle = NULL;          m_create.handle = NULL;
385            m_create.num_threads = (!g_config.num_threads) ? info.num_threads : g_config.num_threads;
386    
387          memset(&m_frame, 0, sizeof(m_frame));          memset(&m_frame, 0, sizeof(m_frame));
388          m_frame.version = XVID_VERSION;          m_frame.version = XVID_VERSION;
Legend:
Removed from v.1.23  
changed lines
  Added in v.1.24
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4