Replace remaining NULL by nullptr when possible.

4 files changed, 27 insertions, 27 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);

diff --git a/src/filters/parser/MpegSplitter/MpegSplitterFile.h b/src/filters/parser/MpegSplitter/MpegSplitterFile.h
index 37768c9ec..d76b5899c 100644
--- a/src/filters/parser/MpegSplitter/MpegSplitterFile.h
+++ b/src/filters/parser/MpegSplitter/MpegSplitterFile.h
@@ -140,7 +140,7 @@ public:
                 }

             }

 

-            return NULL;

+            return nullptr;

         }

 

     } m_streams[unknown];

diff --git a/src/filters/parser/OggSplitter/OggFile.h b/src/filters/parser/OggSplitter/OggFile.h
index c5ed09218..b609e3be3 100644
--- a/src/filters/parser/OggSplitter/OggFile.h
+++ b/src/filters/parser/OggSplitter/OggFile.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.

  *

@@ -91,7 +91,7 @@ class COggFile : public CBaseSplitterFile
 public:

     COggFile(IAsyncReader* pAsyncReader, HRESULT& hr);

 

-    bool Sync(HANDLE hBreak = NULL);

-    bool Read(OggPageHeader& hdr, HANDLE hBreak = NULL);

-    bool Read(OggPage& page, bool fFull = true, HANDLE hBreak = NULL);

+    bool Sync(HANDLE hBreak = nullptr);

+    bool Read(OggPageHeader& hdr, HANDLE hBreak = nullptr);

+    bool Read(OggPage& page, bool fFull = true, HANDLE hBreak = nullptr);

 };