Change : Add "QueryFilterInfo" method to all internal Splitter for normal Filter Name, instead of "file name";

Change : Changed the names of the Splitters filters at the same everywhere;

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@3872 10f7b99b-c216-0410-bff0-8a66a9350fd8

19 files changed, 184 insertions, 22 deletions

diff --git a/src/filters/parser/AviSplitter/AviSplitter.cpp b/src/filters/parser/AviSplitter/AviSplitter.cpp
index ef202ad40..b513dc507 100644
--- a/src/filters/parser/AviSplitter/AviSplitter.cpp
+++ b/src/filters/parser/AviSplitter/AviSplitter.cpp
@@ -38,8 +38,8 @@ const AMOVIESETUP_PIN sudpPins[] = {
 };

 

 const AMOVIESETUP_FILTER sudFilter[] = {

-	{&__uuidof(CAviSplitterFilter), L"MPC - Avi Splitter", MERIT_NORMAL+1, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

-	{&__uuidof(CAviSourceFilter), L"MPC - Avi Source", MERIT_NORMAL+1, 0, NULL, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CAviSplitterFilter), L"MPC Avi Splitter", MERIT_NORMAL+1, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CAviSourceFilter), L"MPC Avi Source", MERIT_NORMAL+1, 0, NULL, CLSID_LegacyAmFilterCategory},

 };

 

 CFactoryTemplate g_Templates[] = {

@@ -126,6 +126,20 @@ STDMETHODIMP CAviSplitterFilter::NonDelegatingQueryInterface(REFIID riid, void**
 		__super::NonDelegatingQueryInterface(riid, ppv);

 }

 

+STDMETHODIMP CAviSplitterFilter::QueryFilterInfo(FILTER_INFO* pInfo)

+{

+	CheckPointer(pInfo, E_POINTER);

+	ValidateReadWritePtr(pInfo, sizeof(FILTER_INFO));

+

+	wcscpy(pInfo->achName, L"MPC Avi Splitter");

+	pInfo->pGraph = m_pGraph;

+	if(m_pGraph) {

+		m_pGraph->AddRef();

+	}

+

+	return S_OK;

+}

+

 HRESULT CAviSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)

 {

 	CheckPointer(pAsyncReader, E_POINTER);

diff --git a/src/filters/parser/AviSplitter/AviSplitter.h b/src/filters/parser/AviSplitter/AviSplitter.h
index c414c5175..1dcc9de5d 100644
--- a/src/filters/parser/AviSplitter/AviSplitter.h
+++ b/src/filters/parser/AviSplitter/AviSplitter.h
@@ -56,6 +56,10 @@ public:
 	DECLARE_IUNKNOWN;

 	STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

 

+	// CBaseFilter

+

+	STDMETHODIMP QueryFilterInfo(FILTER_INFO* pInfo);

+

 	// IMediaSeeking

 

 	STDMETHODIMP GetDuration(LONGLONG* pDuration);

diff --git a/src/filters/parser/DSMSplitter/DSMSplitter.cpp b/src/filters/parser/DSMSplitter/DSMSplitter.cpp
index d06bee4ab..b2abdb78b 100644
--- a/src/filters/parser/DSMSplitter/DSMSplitter.cpp
+++ b/src/filters/parser/DSMSplitter/DSMSplitter.cpp
@@ -39,8 +39,8 @@ const AMOVIESETUP_PIN sudpPins[] = {
 };

 

 const AMOVIESETUP_FILTER sudFilter[] = {

-	{&__uuidof(CDSMSplitterFilter), L"MPC - DSM Splitter", MERIT_NORMAL, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

-	{&__uuidof(CDSMSourceFilter), L"MPC - DSM Source", MERIT_NORMAL, 0, NULL, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CDSMSplitterFilter), L"MPC DSM Splitter", MERIT_NORMAL, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CDSMSourceFilter), L"MPC DSM Source", MERIT_NORMAL, 0, NULL, CLSID_LegacyAmFilterCategory},

 };

 

 CFactoryTemplate g_Templates[] = {

@@ -90,6 +90,20 @@ CDSMSplitterFilter::~CDSMSplitterFilter()
 {

 }

 

+STDMETHODIMP CDSMSplitterFilter::QueryFilterInfo(FILTER_INFO* pInfo)

+{

+	CheckPointer(pInfo, E_POINTER);

+	ValidateReadWritePtr(pInfo, sizeof(FILTER_INFO));

+

+	wcscpy(pInfo->achName, L"MPC DSM Splitter");

+	pInfo->pGraph = m_pGraph;

+	if(m_pGraph) {

+		m_pGraph->AddRef();

+	}

+

+	return S_OK;

+}

+

 static int compare_id(const void* id1, const void* id2)

 {

 	return (int)*(BYTE*)id1 - (int)*(BYTE*)id2;

diff --git a/src/filters/parser/DSMSplitter/DSMSplitter.h b/src/filters/parser/DSMSplitter/DSMSplitter.h
index 616d84b0d..b69660c95 100644
--- a/src/filters/parser/DSMSplitter/DSMSplitter.h
+++ b/src/filters/parser/DSMSplitter/DSMSplitter.h
@@ -41,6 +41,9 @@ public:
 	CDSMSplitterFilter(LPUNKNOWN pUnk, HRESULT* phr);

 	virtual ~CDSMSplitterFilter();

 

+	// CBaseFilter

+	STDMETHODIMP_(HRESULT) QueryFilterInfo(FILTER_INFO* pInfo);

+

 	// IKeyFrameInfo

 

 	STDMETHODIMP_(HRESULT) GetKeyFrameCount(UINT& nKFs);

diff --git a/src/filters/parser/FLVSplitter/FLVSplitter.cpp b/src/filters/parser/FLVSplitter/FLVSplitter.cpp
index f6eb93d08..65385cb7a 100644
--- a/src/filters/parser/FLVSplitter/FLVSplitter.cpp
+++ b/src/filters/parser/FLVSplitter/FLVSplitter.cpp
@@ -52,8 +52,8 @@ const AMOVIESETUP_MEDIATYPE sudPinTypesOut2[] = {
 };

 

 const AMOVIESETUP_FILTER sudFilter[] = {

-	{&__uuidof(CFLVSplitterFilter), L"MPC - FLV Splitter (Gabest)", MERIT_NORMAL, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

-	{&__uuidof(CFLVSourceFilter), L"MPC - FLV Source (Gabest)", MERIT_NORMAL, 0, NULL, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CFLVSplitterFilter), L"MPC Flv Splitter", MERIT_NORMAL, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CFLVSourceFilter), L"MPC Flv Source", MERIT_NORMAL, 0, NULL, CLSID_LegacyAmFilterCategory},

 };

 

 CFactoryTemplate g_Templates[] = {

@@ -94,6 +94,20 @@ CFLVSplitterFilter::CFLVSplitterFilter(LPUNKNOWN pUnk, HRESULT* phr)
 {

 }

 

+STDMETHODIMP CFLVSplitterFilter::QueryFilterInfo(FILTER_INFO* pInfo)

+{

+	CheckPointer(pInfo, E_POINTER);

+	ValidateReadWritePtr(pInfo, sizeof(FILTER_INFO));

+

+	wcscpy(pInfo->achName, L"MPC Flv Splitter");

+	pInfo->pGraph = m_pGraph;

+	if(m_pGraph) {

+		m_pGraph->AddRef();

+	}

+

+	return S_OK;

+}

+

 bool CFLVSplitterFilter::ReadTag(Tag& t)

 {

 	if(m_pFile->GetRemaining() < 15) {

diff --git a/src/filters/parser/FLVSplitter/FLVSplitter.h b/src/filters/parser/FLVSplitter/FLVSplitter.h
index da28edf7e..3405061e0 100644
--- a/src/filters/parser/FLVSplitter/FLVSplitter.h
+++ b/src/filters/parser/FLVSplitter/FLVSplitter.h
@@ -79,6 +79,10 @@ protected:
 

 public:

 	CFLVSplitterFilter(LPUNKNOWN pUnk, HRESULT* phr);

+

+	// CBaseFilter

+	STDMETHODIMP_(HRESULT) QueryFilterInfo(FILTER_INFO* pInfo);

+

 };

 

 class __declspec(uuid("C9ECE7B3-1D8E-41F5-9F24-B255DF16C087"))

diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.cpp b/src/filters/parser/MP4Splitter/MP4Splitter.cpp
index 73b1dc643..4fabeec73 100644
--- a/src/filters/parser/MP4Splitter/MP4Splitter.cpp
+++ b/src/filters/parser/MP4Splitter/MP4Splitter.cpp
@@ -52,10 +52,10 @@ const AMOVIESETUP_PIN sudpPins[] = {
 };

 

 const AMOVIESETUP_FILTER sudFilter[] = {

-	{&__uuidof(CMP4SplitterFilter), L"MPC - MP4 Splitter", MERIT_NORMAL, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

-	{&__uuidof(CMP4SourceFilter), L"MPC - MP4 Source", MERIT_NORMAL, 0, NULL, CLSID_LegacyAmFilterCategory},

-	{&__uuidof(CMPEG4VideoSplitterFilter), L"MPC - MPEG4 Video Splitter", MERIT_NORMAL, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

-	{&__uuidof(CMPEG4VideoSourceFilter), L"MPC - MPEG4 Video Source", MERIT_NORMAL, 0, NULL, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CMP4SplitterFilter), L"MPC MP4/MOV Splitter", MERIT_NORMAL, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CMP4SourceFilter), L"MPC MP4/MOV Source", MERIT_NORMAL, 0, NULL, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CMPEG4VideoSplitterFilter), L"MPC MPEG4 Video Splitter", MERIT_NORMAL, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CMPEG4VideoSourceFilter), L"MPC MPEG4 Video Source", MERIT_NORMAL, 0, NULL, CLSID_LegacyAmFilterCategory},

 };

 

 CFactoryTemplate g_Templates[] = {

@@ -115,6 +115,19 @@ CMP4SplitterFilter::~CMP4SplitterFilter()
 {

 }

 

+STDMETHODIMP CMP4SplitterFilter::QueryFilterInfo(FILTER_INFO* pInfo)

+{

+	CheckPointer(pInfo, E_POINTER);

+	ValidateReadWritePtr(pInfo, sizeof(FILTER_INFO));

+

+	wcscpy(pInfo->achName, L"MPC MP4/MOV Splitter");

+	pInfo->pGraph = m_pGraph;

+	if(m_pGraph) {

+		m_pGraph->AddRef();

+	}

+

+	return S_OK;

+}

 HRESULT CMP4SplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)

 {

 	CheckPointer(pAsyncReader, E_POINTER);

diff --git a/src/filters/parser/MP4Splitter/MP4Splitter.h b/src/filters/parser/MP4Splitter/MP4Splitter.h
index 49f7b243a..535a2c3f4 100644
--- a/src/filters/parser/MP4Splitter/MP4Splitter.h
+++ b/src/filters/parser/MP4Splitter/MP4Splitter.h
@@ -48,6 +48,9 @@ public:
 	CMP4SplitterFilter(LPUNKNOWN pUnk, HRESULT* phr);

 	virtual ~CMP4SplitterFilter();

 

+	// CBaseFilter

+	STDMETHODIMP_(HRESULT) QueryFilterInfo(FILTER_INFO* pInfo);

+

 	// IKeyFrameInfo

 

 	STDMETHODIMP_(HRESULT) GetKeyFrameCount(UINT& nKFs);

diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp
index 54bf638f9..deba1200b 100644
--- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp
+++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp
@@ -43,8 +43,8 @@ const AMOVIESETUP_PIN sudpPins[] = {
 };

 

 const AMOVIESETUP_FILTER sudFilter[] = {

-	{&__uuidof(CMatroskaSplitterFilter), L"MPC - Matroska Splitter", MERIT_NORMAL, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

-	{&__uuidof(CMatroskaSourceFilter), L"MPC - Matroska Source", MERIT_NORMAL, 0, NULL, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CMatroskaSplitterFilter), L"MPC Matroska Splitter", MERIT_NORMAL, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CMatroskaSourceFilter), L"MPC Matroska Source", MERIT_NORMAL, 0, NULL, CLSID_LegacyAmFilterCategory},

 };

 

 CFactoryTemplate g_Templates[] = {

@@ -100,6 +100,20 @@ STDMETHODIMP CMatroskaSplitterFilter::NonDelegatingQueryInterface(REFIID riid, v
 		__super::NonDelegatingQueryInterface(riid, ppv);

 }

 

+STDMETHODIMP CMatroskaSplitterFilter::QueryFilterInfo(FILTER_INFO* pInfo)

+{

+	CheckPointer(pInfo, E_POINTER);

+	ValidateReadWritePtr(pInfo, sizeof(FILTER_INFO));

+

+	wcscpy(pInfo->achName, L"MPC Matroska Splitter");

+	pInfo->pGraph = m_pGraph;

+	if(m_pGraph) {

+		m_pGraph->AddRef();

+	}

+

+	return S_OK;

+}

+

 HRESULT CMatroskaSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)

 {

 	CheckPointer(pAsyncReader, E_POINTER);

diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.h b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.h
index 6e609cf58..d11f5f682 100644
--- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.h
+++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.h
@@ -99,6 +99,10 @@ public:
 	DECLARE_IUNKNOWN;

 	STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

 

+	// CBaseFilter

+

+	STDMETHODIMP QueryFilterInfo(FILTER_INFO* pInfo);

+

 	// IKeyFrameInfo

 

 	STDMETHODIMP GetKeyFrameCount(UINT& nKFs);

diff --git a/src/filters/parser/MpaSplitter/MpaSplitter.cpp b/src/filters/parser/MpaSplitter/MpaSplitter.cpp
index f7fbba02e..684c3a4ec 100644
--- a/src/filters/parser/MpaSplitter/MpaSplitter.cpp
+++ b/src/filters/parser/MpaSplitter/MpaSplitter.cpp
@@ -38,8 +38,8 @@ const AMOVIESETUP_PIN sudpPins[] = {
 };

 

 const AMOVIESETUP_FILTER sudFilter[] = {

-	{&__uuidof(CMpaSplitterFilter), L"MPC - Mpa Splitter", MERIT_NORMAL+1, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

-	{&__uuidof(CMpaSourceFilter), L"MPC - Mpa Source", MERIT_NORMAL+1, 0, NULL, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CMpaSplitterFilter), L"MPC Mpa Splitter", MERIT_NORMAL+1, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CMpaSourceFilter), L"MPC Mpa Source", MERIT_NORMAL+1, 0, NULL, CLSID_LegacyAmFilterCategory},

 };

 

 CFactoryTemplate g_Templates[] = {

@@ -87,6 +87,20 @@ STDMETHODIMP CMpaSplitterFilter::NonDelegatingQueryInterface(REFIID riid, void**
 		__super::NonDelegatingQueryInterface(riid, ppv);

 }

 

+STDMETHODIMP CMpaSplitterFilter::QueryFilterInfo(FILTER_INFO* pInfo)

+{

+	CheckPointer(pInfo, E_POINTER);

+	ValidateReadWritePtr(pInfo, sizeof(FILTER_INFO));

+

+	wcscpy(pInfo->achName, L"MPC Mpa Splitter");

+	pInfo->pGraph = m_pGraph;

+	if(m_pGraph) {

+		m_pGraph->AddRef();

+	}

+

+	return S_OK;

+}

+

 HRESULT CMpaSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)

 {

 	CheckPointer(pAsyncReader, E_POINTER);

diff --git a/src/filters/parser/MpaSplitter/MpaSplitter.h b/src/filters/parser/MpaSplitter/MpaSplitter.h
index 064a91d36..9af36cbc3 100644
--- a/src/filters/parser/MpaSplitter/MpaSplitter.h
+++ b/src/filters/parser/MpaSplitter/MpaSplitter.h
@@ -44,6 +44,11 @@ public:
 

 	DECLARE_IUNKNOWN

 	STDMETHODIMP NonDelegatingQueryInterface(REFIID riid, void** ppv);

+

+	// CBaseFilter

+

+	STDMETHODIMP QueryFilterInfo(FILTER_INFO* pInfo);

+

 };

 

 class __declspec(uuid("59A0DB73-0287-4C9A-9D3C-8CFF39F8E5DB"))

diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.cpp b/src/filters/parser/MpegSplitter/MpegSplitter.cpp
index a75b71a81..47f650fdc 100644
--- a/src/filters/parser/MpegSplitter/MpegSplitter.cpp
+++ b/src/filters/parser/MpegSplitter/MpegSplitter.cpp
@@ -77,8 +77,8 @@ const AMOVIESETUP_PIN sudpPins[] = {
 };

 

 const AMOVIESETUP_FILTER sudFilter[] = {

-	{&__uuidof(CMpegSplitterFilter), L"MPC - Mpeg Splitter (Gabest)", MERIT_NORMAL+1, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

-	{&__uuidof(CMpegSourceFilter), L"MPC - Mpeg Source (Gabest)", MERIT_UNLIKELY, 0, NULL, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CMpegSplitterFilter), L"MPC Mpeg Splitter", MERIT_NORMAL+1, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CMpegSourceFilter), L"MPC Mpeg Source", MERIT_UNLIKELY, 0, NULL, CLSID_LegacyAmFilterCategory},

 };

 

 CFactoryTemplate g_Templates[] = {

@@ -577,6 +577,20 @@ STDMETHODIMP CMpegSplitterFilter::GetClassID(CLSID* pClsID)
 	}

 }

 

+STDMETHODIMP CMpegSplitterFilter::QueryFilterInfo(FILTER_INFO* pInfo)

+{

+	CheckPointer(pInfo, E_POINTER);

+	ValidateReadWritePtr(pInfo, sizeof(FILTER_INFO));

+

+	wcscpy(pInfo->achName, L"MPC Mpeg Splitter");

+	pInfo->pGraph = m_pGraph;

+	if(m_pGraph) {

+		m_pGraph->AddRef();

+	}

+

+	return S_OK;

+}

+

 void CMpegSplitterFilter::ReadClipInfo(LPCOLESTR pszFileName)

 {

 	if (wcslen (pszFileName) > 0) {

diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.h b/src/filters/parser/MpegSplitter/MpegSplitter.h
index 89e31b3a3..800599582 100644
--- a/src/filters/parser/MpegSplitter/MpegSplitter.h
+++ b/src/filters/parser/MpegSplitter/MpegSplitter.h
@@ -90,6 +90,10 @@ public:
 	STDMETHODIMP GetClassID(CLSID* pClsID);

 	STDMETHODIMP Load(LPCOLESTR pszFileName, const AM_MEDIA_TYPE* pmt);

 

+	// CBaseFilter

+

+	STDMETHODIMP QueryFilterInfo(FILTER_INFO* pInfo);

+

 	// IAMStreamSelect

 

 	STDMETHODIMP Count(DWORD* pcStreams);

diff --git a/src/filters/parser/OggSplitter/OggSplitter.cpp b/src/filters/parser/OggSplitter/OggSplitter.cpp
index ccf7ad3f8..4b80829f9 100644
--- a/src/filters/parser/OggSplitter/OggSplitter.cpp
+++ b/src/filters/parser/OggSplitter/OggSplitter.cpp
@@ -48,8 +48,8 @@ const AMOVIESETUP_PIN sudpPins[] = {
 };

 

 const AMOVIESETUP_FILTER sudFilter[] = {

-	{&__uuidof(COggSplitterFilter), L"MPC - Ogg Splitter", MERIT_NORMAL+1, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

-	{&__uuidof(COggSourceFilter), L"MPC - Ogg Source", MERIT_NORMAL+1, 0, NULL, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(COggSplitterFilter), L"MPC Ogg Splitter", MERIT_NORMAL+1, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(COggSourceFilter), L"MPC Ogg Source", MERIT_NORMAL+1, 0, NULL, CLSID_LegacyAmFilterCategory},

 };

 

 CFactoryTemplate g_Templates[] = {

@@ -147,6 +147,20 @@ COggSplitterFilter::~COggSplitterFilter()
 {

 }

 

+STDMETHODIMP COggSplitterFilter::QueryFilterInfo(FILTER_INFO* pInfo)

+{

+	CheckPointer(pInfo, E_POINTER);

+	ValidateReadWritePtr(pInfo, sizeof(FILTER_INFO));

+

+	wcscpy(pInfo->achName, L"MPC Ogg Splitter");

+	pInfo->pGraph = m_pGraph;

+	if(m_pGraph) {

+		m_pGraph->AddRef();

+	}

+

+	return S_OK;

+}

+

 HRESULT COggSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)

 {

 	CheckPointer(pAsyncReader, E_POINTER);

diff --git a/src/filters/parser/OggSplitter/OggSplitter.h b/src/filters/parser/OggSplitter/OggSplitter.h
index c2067d735..dbbba71e0 100644
--- a/src/filters/parser/OggSplitter/OggSplitter.h
+++ b/src/filters/parser/OggSplitter/OggSplitter.h
@@ -196,6 +196,11 @@ protected:
 public:

 	COggSplitterFilter(LPUNKNOWN pUnk, HRESULT* phr);

 	virtual ~COggSplitterFilter();

+

+	// CBaseFilter

+

+	STDMETHODIMP_(HRESULT) QueryFilterInfo(FILTER_INFO* pInfo);

+

 };

 

 class __declspec(uuid("6D3688CE-3E9D-42F4-92CA-8A11119D25CD"))

diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp
index f75210a06..903bc9627 100644
--- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp
+++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp
@@ -134,10 +134,10 @@ const AMOVIESETUP_PIN sudpPins3[] = {
 };

 

 const AMOVIESETUP_FILTER sudFilter[] = {

-	{&__uuidof(CRealMediaSplitterFilter), L"MPC - RealMedia Splitter", MERIT_NORMAL, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

-	{&__uuidof(CRealMediaSourceFilter), L"MPC - RealMedia Source", MERIT_NORMAL, 0, NULL, CLSID_LegacyAmFilterCategory},

-	{&__uuidof(CRealVideoDecoder), L"MPC - RealVideo Decoder", MERIT_NORMAL, countof(sudpPins2), sudpPins2, CLSID_LegacyAmFilterCategory},

-	{&__uuidof(CRealAudioDecoder), L"MPC - RealAudio Decoder", MERIT_NORMAL, countof(sudpPins3), sudpPins3, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CRealMediaSplitterFilter), L"MPC RealMedia Splitter", MERIT_NORMAL, countof(sudpPins), sudpPins, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CRealMediaSourceFilter), L"MPC RealMedia Source", MERIT_NORMAL, 0, NULL, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CRealVideoDecoder), L"MPC RealVideo Decoder", MERIT_NORMAL, countof(sudpPins2), sudpPins2, CLSID_LegacyAmFilterCategory},

+	{&__uuidof(CRealAudioDecoder), L"MPC RealAudio Decoder", MERIT_NORMAL, countof(sudpPins3), sudpPins3, CLSID_LegacyAmFilterCategory},

 };

 

 CFactoryTemplate g_Templates[] = {

@@ -182,6 +182,20 @@ CRealMediaSplitterFilter::~CRealMediaSplitterFilter()
 {

 }

 

+STDMETHODIMP CRealMediaSplitterFilter::QueryFilterInfo(FILTER_INFO* pInfo)

+{

+	CheckPointer(pInfo, E_POINTER);

+	ValidateReadWritePtr(pInfo, sizeof(FILTER_INFO));

+

+	wcscpy(pInfo->achName, L"MPC RealMedia Splitter");

+	pInfo->pGraph = m_pGraph;

+	if(m_pGraph) {

+		m_pGraph->AddRef();

+	}

+

+	return S_OK;

+}

+

 HRESULT CRealMediaSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)

 {

 	CheckPointer(pAsyncReader, E_POINTER);

diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.h b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.h
index 89f2e0b59..050b26f65 100644
--- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.h
+++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.h
@@ -215,6 +215,10 @@ public:
 	CRealMediaSplitterFilter(LPUNKNOWN pUnk, HRESULT* phr);

 	virtual ~CRealMediaSplitterFilter();

 

+	// CBaseFilter

+

+	STDMETHODIMP_(HRESULT) QueryFilterInfo(FILTER_INFO* pInfo);

+

 	// IKeyFrameInfo

 

 	STDMETHODIMP_(HRESULT) GetKeyFrameCount(UINT& nKFs);

diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp b/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp
index da4c0d963..7e801d475 100644
--- a/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp
+++ b/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp
@@ -187,6 +187,7 @@ bool CMPCVideoDecSettingsWnd::OnActivate()
 	}

 

 	CorrectComboListWidth(m_cbDXVACompatibilityCheck);

+	CorrectComboListWidth(m_cbDiscardMode);

 

 	if (m_pMDF) {

 #if HAS_FFMPEG_VIDEO_DECODERS