diff options
| author | clsid2 <clsid2@users.sourceforge.net> | 2010-01-09 17:59:34 +0300 |
|---|---|---|
| committer | clsid2 <clsid2@users.sourceforge.net> | 2010-01-09 17:59:34 +0300 |
| commit | 099febdc2ed5eee22d33278bf51f85d1ff1bc5eb (patch) | |
| tree | 65ba0752e2b4559f5603be57da941e05449053d3 /src/apps/mplayerc/FGManager.cpp | |
| parent | 20a0ba35d84729680f4b5277971b0ec8981a6a47 (diff) | |
Added support for the FourCC "CCV1" that is used by Haali Media Splitter
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1492 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/apps/mplayerc/FGManager.cpp')
| -rw-r--r-- | src/apps/mplayerc/FGManager.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/apps/mplayerc/FGManager.cpp b/src/apps/mplayerc/FGManager.cpp index bd0819ee7..ad6fc1f8d 100644 --- a/src/apps/mplayerc/FGManager.cpp +++ b/src/apps/mplayerc/FGManager.cpp @@ -1887,6 +1887,7 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_AVC1);
pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_avc1);
pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_H264_bis);
+ pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_CCV1);
}
#endif
#if INTERNAL_DECODER_VC1 | INTERNAL_DECODER_VC1_DXVA
@@ -2069,6 +2070,7 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_AVC1);
pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_avc1);
pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_H264_bis);
+ pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_CCV1);
}
#endif
#if INTERNAL_DECODER_VC1 | INTERNAL_DECODER_VC1_DXVA
@@ -2263,10 +2265,12 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) m_transform.AddTail(DNew CFGFilterRegistry(GUIDFromCString(clsid), MERIT64_DO_NOT_USE));
}
}
+
/*
// NVIDIA Transport Demux crashed for someone, I could not reproduce it
m_transform.AddTail(DNew CFGFilterRegistry(GUIDFromCString(_T("{735823C1-ACC4-11D3-85AC-006008376FB8}")), MERIT64_DO_NOT_USE));
*/
+
// mainconcept color space converter
m_transform.AddTail(DNew CFGFilterRegistry(GUIDFromCString(_T("{272D77A0-A852-4851-ADA4-9091FEAD4C86}")), MERIT64_DO_NOT_USE));
@@ -2317,7 +2321,7 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) }
}
- // Use Broadcom decoder if installed for VC1, H264 and Mpeg2
+ /* Use Broadcom decoder (if installed) for VC-1, H.264 and MPEG-2 */
if (!bOverrideBroadcom)
{
pFGF = DNew CFGFilterRegistry(GUIDFromCString(_T("{2DE1D17E-46B1-42A8-9AEC-E20E80D9B1A9}")), MERIT64_ABOVE_DSHOW);
@@ -2334,6 +2338,7 @@ CFGManagerCustom::CFGManagerCustom(LPCTSTR pName, LPUNKNOWN pUnk) pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_AVC1);
pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_avc1);
pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_H264_bis);
+ pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_CCV1);
pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_WVC1);
pFGF->AddType(MEDIATYPE_Video, MEDIASUBTYPE_wvc1);
|