diff options
author | Underground78 <underground78@users.sourceforge.net> | 2013-05-31 00:28:29 +0400 |
---|---|---|
committer | Underground78 <underground78@users.sourceforge.net> | 2013-06-19 00:18:19 +0400 |
commit | c5fb9c73b7f622300cf5d36346fdf8872d79cf2b (patch) | |
tree | fa7ebb3e907311ea8cf0a856ad781bcd45367dc7 /src/filters/parser/BaseSplitter | |
parent | 0d31965a98684ffe01c42a15a40a30c8388f7d3d (diff) |
Replace remaining NULL by nullptr when possible.
Diffstat (limited to 'src/filters/parser/BaseSplitter')
-rw-r--r-- | src/filters/parser/BaseSplitter/BaseSplitter.h | 6 | ||||
-rw-r--r-- | src/filters/parser/BaseSplitter/BaseSplitterFileEx.h | 38 |
2 files changed, 22 insertions, 22 deletions
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.h b/src/filters/parser/BaseSplitter/BaseSplitter.h index 8e89d7c30..b6aa1c251 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.h +++ b/src/filters/parser/BaseSplitter/BaseSplitter.h @@ -1,6 +1,6 @@ /*
* (C) 2003-2006 Gabest
- * (C) 2006-2012 see Authors.txt
+ * (C) 2006-2013 see Authors.txt
*
* This file is part of MPC-HC.
*
@@ -109,7 +109,7 @@ public: REFERENCE_TIME rtStart, rtStop;
AM_MEDIA_TYPE* pmt;
Packet() {
- pmt = NULL;
+ pmt = nullptr;
bDiscontinuity = bAppendable = FALSE;
}
virtual ~Packet() {
@@ -261,7 +261,7 @@ public: // Queueing
HANDLE GetThreadHandle() {
- ASSERT(m_hThread != NULL);
+ ASSERT(m_hThread != nullptr);
return m_hThread;
}
void SetThreadPriority(int nPriority) {
diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.h b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.h index a7f8e80de..b91fe555e 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitterFileEx.h +++ b/src/filters/parser/BaseSplitter/BaseSplitterFileEx.h @@ -415,28 +415,28 @@ public: bool Read(pshdr& h);
bool Read(pssyshdr& h);
bool Read(peshdr& h, BYTE code);
- bool Read(seqhdr& h, int len, CMediaType* pmt = NULL);
- bool Read(mpahdr& h, int len, bool fAllowV25, CMediaType* pmt = NULL);
- bool Read(aachdr& h, int len, CMediaType* pmt = NULL, MPEG_TYPES m_type = mpeg_es);
- bool Read(latm_aachdr& h, int len, CMediaType* pmt = NULL);
- bool Read(ac3hdr& h, int len, CMediaType* pmt = NULL, bool find_sync = true, bool AC3CoreOnly = true);
- bool Read(dtshdr& h, int len, CMediaType* pmt = NULL, bool find_sync = true);
- bool Read(lpcmhdr& h, CMediaType* pmt = NULL);
- bool Read(dvdalpcmhdr& h, int len, CMediaType* pmt = NULL);
- bool Read(hdmvlpcmhdr& h, CMediaType* pmt = NULL);
- bool Read(mlphdr& h, int len, CMediaType* pmt = NULL, bool find_sync = false);
- bool Read(dvdspuhdr& h, CMediaType* pmt = NULL);
- bool Read(hdmvsubhdr& h, CMediaType* pmt = NULL, const char* language_code = NULL);
- bool Read(svcdspuhdr& h, CMediaType* pmt = NULL);
- bool Read(cvdspuhdr& h, CMediaType* pmt = NULL);
- bool Read(ps2audhdr& h, CMediaType* pmt = NULL);
- bool Read(ps2subhdr& h, CMediaType* pmt = NULL);
+ bool Read(seqhdr& h, int len, CMediaType* pmt = nullptr);
+ bool Read(mpahdr& h, int len, bool fAllowV25, CMediaType* pmt = nullptr);
+ bool Read(aachdr& h, int len, CMediaType* pmt = nullptr, MPEG_TYPES m_type = mpeg_es);
+ bool Read(latm_aachdr& h, int len, CMediaType* pmt = nullptr);
+ bool Read(ac3hdr& h, int len, CMediaType* pmt = nullptr, bool find_sync = true, bool AC3CoreOnly = true);
+ bool Read(dtshdr& h, int len, CMediaType* pmt = nullptr, bool find_sync = true);
+ bool Read(lpcmhdr& h, CMediaType* pmt = nullptr);
+ bool Read(dvdalpcmhdr& h, int len, CMediaType* pmt = nullptr);
+ bool Read(hdmvlpcmhdr& h, CMediaType* pmt = nullptr);
+ bool Read(mlphdr& h, int len, CMediaType* pmt = nullptr, bool find_sync = false);
+ bool Read(dvdspuhdr& h, CMediaType* pmt = nullptr);
+ bool Read(hdmvsubhdr& h, CMediaType* pmt = nullptr, const char* language_code = nullptr);
+ bool Read(svcdspuhdr& h, CMediaType* pmt = nullptr);
+ bool Read(cvdspuhdr& h, CMediaType* pmt = nullptr);
+ bool Read(ps2audhdr& h, CMediaType* pmt = nullptr);
+ bool Read(ps2subhdr& h, CMediaType* pmt = nullptr);
bool Read(tshdr& h, bool fSync = true);
bool Read(trsechdr& h);
bool Read(pvahdr& h, bool fSync = true);
- bool Read(avchdr& h, int len, CMediaType* pmt = NULL);
- bool Read(vc1hdr& h, int len, CMediaType* pmt = NULL, int guid_flag = 1);
- bool Read(dvbsub& h, int len, CMediaType* pmt = NULL);
+ bool Read(avchdr& h, int len, CMediaType* pmt = nullptr);
+ bool Read(vc1hdr& h, int len, CMediaType* pmt = nullptr, int guid_flag = 1);
+ bool Read(dvbsub& h, int len, CMediaType* pmt = nullptr);
bool Read(avchdr& h, spsppsindex index);
int HrdParameters(CGolombBuffer& gb);
|