[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.14, Mon Mar 14 01:18:20 2005 UTC revision 1.15, Thu Sep 15 10:52:28 2005 UTC
# Line 826  Line 826 
826                          return S_FALSE;                          return S_FALSE;
827                  } else                  } else
828                          if (g_config.aspect_ratio == 0 || g_config.aspect_ratio == 1 && forced_ar == false) {                          if (g_config.aspect_ratio == 0 || g_config.aspect_ratio == 1 && forced_ar == false) {
                         // inspired by minolta! works for VMR 7 + 9  
829    
830          if (stats.type != XVID_TYPE_NOTHING) {  /* dont attempt to set vmr aspect ratio if no frame was returned by decoder */
831                            // inspired by minolta! works for VMR 7 + 9
832                          IMediaSample2 *pOut2 = NULL;                          IMediaSample2 *pOut2 = NULL;
833                          AM_SAMPLE2_PROPERTIES outProp2;                          AM_SAMPLE2_PROPERTIES outProp2;
834                          if (SUCCEEDED(pOut->QueryInterface(IID_IMediaSample2, (void **)&pOut2)) &&                          if (SUCCEEDED(pOut->QueryInterface(IID_IMediaSample2, (void **)&pOut2)) &&
# Line 848  Line 849 
849                          }                          }
850                  }                  }
851          }          }
852            }
853          else          else
854          {       /* Preroll frame - won't be displayed */          {       /* Preroll frame - won't be displayed */
855                  int tmp = m_frame.output.csp;                  int tmp = m_frame.output.csp;
Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4