19 |
* along with this program ; if not, write to the Free Software |
* along with this program ; if not, write to the Free Software |
20 |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
21 |
* |
* |
22 |
* $Id: CXvidDecoder.cpp,v 1.14 2005-03-14 01:18:20 Isibaar Exp $ |
* $Id: CXvidDecoder.cpp,v 1.15 2005-09-15 10:52:28 suxen_drol Exp $ |
23 |
* |
* |
24 |
****************************************************************************/ |
****************************************************************************/ |
25 |
|
|
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)) && |
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; |