Initialize class variables in the class, instead of the constructor

This uses the new C++11 initialization features, which put the init
in the same place where they are declared.

23 files changed, 107 insertions, 177 deletions

diff --git a/demuxer/Demuxers/BDDemuxer.cpp b/demuxer/Demuxers/BDDemuxer.cpp
index 658d9a03..7a7f0047 100644
--- a/demuxer/Demuxers/BDDemuxer.cpp
+++ b/demuxer/Demuxers/BDDemuxer.cpp
@@ -98,16 +98,7 @@ static void bd_log(const char *log) {
 
 CBDDemuxer::CBDDemuxer(CCritSec *pLock, ILAVFSettingsInternal *pSettings)
   : CBaseDemuxer(L"bluray demuxer", pLock)
-  , m_lavfDemuxer(NULL)
-  , m_pb(NULL)
-  , m_pBD(NULL)
-  , m_pTitle(NULL)
   , m_pSettings(pSettings)
-  , m_rtOffset(NULL)
-  , m_rtNewOffset(0)
-  , m_bNewOffsetPos(0)
-  , m_nTitleCount(0)
-  , m_EndOfStreamPacketFlushProtection(FALSE)
 {
 #ifdef DEBUG
   bd_set_debug_mask(DBG_FILE|DBG_BLURAY|DBG_DIR|DBG_NAV|DBG_CRIT);
diff --git a/demuxer/Demuxers/BDDemuxer.h b/demuxer/Demuxers/BDDemuxer.h
index d46bf884..4e65ee6d 100644
--- a/demuxer/Demuxers/BDDemuxer.h
+++ b/demuxer/Demuxers/BDDemuxer.h
@@ -80,18 +80,18 @@ private:
   static int64_t CBDDemuxer::BDByteStreamSeek(void *opaque,  int64_t offset, int whence);
 
 private:
-  BLURAY *m_pBD;
-  AVIOContext *m_pb;
+  BLURAY      *m_pBD                      = nullptr;
+  AVIOContext *m_pb                       = nullptr;
 
-  ILAVFSettingsInternal *m_pSettings;
-  CLAVFDemuxer *m_lavfDemuxer;
+  ILAVFSettingsInternal *m_pSettings      = nullptr;
+  CLAVFDemuxer          *m_lavfDemuxer    = nullptr;
 
-  BLURAY_TITLE_INFO *m_pTitle;
-  uint32_t          m_nTitleCount;
+  BLURAY_TITLE_INFO *m_pTitle             = nullptr;
+  uint32_t           m_nTitleCount        = 0;
 
-  REFERENCE_TIME *m_rtOffset;
-  REFERENCE_TIME m_rtNewOffset;
-  int64_t       m_bNewOffsetPos;
+  REFERENCE_TIME *m_rtOffset              = nullptr;
+  REFERENCE_TIME  m_rtNewOffset           = 0;
+  int64_t         m_bNewOffsetPos         = 0;
 
-  BOOL m_EndOfStreamPacketFlushProtection;
+  BOOL m_EndOfStreamPacketFlushProtection = FALSE;
 };
diff --git a/demuxer/Demuxers/BaseDemuxer.h b/demuxer/Demuxers/BaseDemuxer.h
index aec3cecf..15223ae6 100644
--- a/demuxer/Demuxers/BaseDemuxer.h
+++ b/demuxer/Demuxers/BaseDemuxer.h
@@ -124,7 +124,7 @@ protected:
   void CreatePGSForcedSubtitleStream();
 
 public:
-  // Get the StreamList of the correponding type
+  // Get the StreamList of the corresponding type
   virtual CStreamList *GetStreams(StreamType type) { return &m_streams[type]; }
 
   
@@ -138,7 +138,7 @@ public:
   virtual const stream* SelectSubtitleStream(std::list<CSubtitleSelector> subtitleSelectors, std::string audioLanguage) = 0;
 
 protected:
-  CCritSec *m_pLock;
+  CCritSec *m_pLock = nullptr;
   CStreamList m_streams[unknown];
   int m_dActiveStreams[unknown];
 };
diff --git a/demuxer/Demuxers/LAVFDemuxer.cpp b/demuxer/Demuxers/LAVFDemuxer.cpp
index cfee3928..14e14d46 100644
--- a/demuxer/Demuxers/LAVFDemuxer.cpp
+++ b/demuxer/Demuxers/LAVFDemuxer.cpp
@@ -86,29 +86,6 @@ std::set<FormatInfo> CLAVFDemuxer::GetFormatList()
 
 CLAVFDemuxer::CLAVFDemuxer(CCritSec *pLock, ILAVFSettingsInternal *settings)
   : CBaseDemuxer(L"lavf demuxer", pLock)
-  , m_avFormat(NULL)
-  , m_program(0)
-  , m_rtCurrent(0)
-  , m_bMatroska(FALSE)
-  , m_bOgg(FALSE)
-  , m_bAVI(FALSE)
-  , m_bMPEGTS(FALSE)
-  , m_bMPEGPS(FALSE)
-  , m_bRM(FALSE)
-  , m_bPMP(FALSE)
-  , m_bMP4(FALSE)
-  , m_bTSDiscont(FALSE)
-  , m_pBluRay(NULL)
-  , m_bVC1Correction(FALSE)
-  , m_bVC1SeenTimestamp(FALSE)
-  , m_bPGSNoParsing(TRUE)
-  , m_ForcedSubStream(-1)
-  , m_pSettings(NULL)
-  , m_stOrigParser(NULL)
-  , m_pFontInstaller(NULL)
-  , m_pszInputFormat(NULL)
-  , m_bEnableTrackInfo(TRUE)
-  , m_Abort(0), m_timeOpening(0)
 {
   m_bSubStreams = settings->GetSubstreamsEnabled();
 
diff --git a/demuxer/Demuxers/LAVFDemuxer.h b/demuxer/Demuxers/LAVFDemuxer.h
index 405f19e9..2a7454b8 100644
--- a/demuxer/Demuxers/LAVFDemuxer.h
+++ b/demuxer/Demuxers/LAVFDemuxer.h
@@ -159,40 +159,38 @@ private:
   STDMETHODIMP CreatePacketMediaType(Packet *pPacket, enum AVCodecID codec_id, BYTE *extradata, int extradata_size, BYTE *paramchange, int paramchange_size);
 
 private:
-  AVFormatContext *m_avFormat;
-  const char *m_pszInputFormat;
+  AVFormatContext *m_avFormat        = nullptr;
+  const char      *m_pszInputFormat  = nullptr;
 
-  BOOL m_bMatroska;
-  BOOL m_bOgg;
-  BOOL m_bAVI;
-  BOOL m_bMPEGTS;
-  BOOL m_bMPEGPS;
-  BOOL m_bRM;
-  BOOL m_bPMP;
-  BOOL m_bMP4;
-  BOOL m_bTSDiscont;
-  BOOL m_bVC1Correction;
+  BOOL m_bMatroska                   = FALSE;
+  BOOL m_bOgg                        = FALSE;
+  BOOL m_bAVI                        = FALSE;
+  BOOL m_bMPEGTS                     = FALSE;
+  BOOL m_bMPEGPS                     = FALSE;
+  BOOL m_bRM                         = FALSE;
+  BOOL m_bPMP                        = FALSE;
+  BOOL m_bMP4                        = FALSE;
 
-  BOOL m_bSubStreams;
+  BOOL m_bTSDiscont                  = FALSE;
+  BOOL m_bSubStreams                 = FALSE;
+  BOOL m_bVC1Correction              = FALSE;
+  BOOL m_bVC1SeenTimestamp           = FALSE;
+  BOOL m_bPGSNoParsing               = FALSE;
 
-  BOOL m_bVC1SeenTimestamp;
+  int m_ForcedSubStream              = -1;
+  unsigned int m_program             = 0;
 
-  BOOL m_bPGSNoParsing;
-  int m_ForcedSubStream;
+  REFERENCE_TIME m_rtCurrent         = 0;
 
-  unsigned int m_program;
+  AVStreamParseType *m_stOrigParser  = nullptr;
 
-  REFERENCE_TIME m_rtCurrent;
+  CFontInstaller *m_pFontInstaller   = nullptr;
+  ILAVFSettingsInternal *m_pSettings = nullptr;
 
-  enum AVStreamParseType *m_stOrigParser;
+  BOOL m_bEnableTrackInfo            = FALSE;
 
-  CFontInstaller *m_pFontInstaller;
-  ILAVFSettingsInternal *m_pSettings;
+  CBDDemuxer *m_pBluRay              = nullptr;
 
-  BOOL m_bEnableTrackInfo;
-
-  CBDDemuxer *m_pBluRay;
-
-  int m_Abort;
-  time_t m_timeOpening;
+  int m_Abort                        = 0;
+  time_t m_timeOpening               = 0;
 };
diff --git a/demuxer/Demuxers/LAVFUtils.h b/demuxer/Demuxers/LAVFUtils.h
index b7ec9643..6726c15c 100644
--- a/demuxer/Demuxers/LAVFUtils.h
+++ b/demuxer/Demuxers/LAVFUtils.h
@@ -19,12 +19,12 @@
 
 #pragma once
 
-typedef struct sFormatMapping {
+struct FormatMapping {
   AVCodecID codec;
   const GUID *subtype;
   unsigned codecTag;
   const GUID *format;
-} FormatMapping;
+};
 
 const char *get_stream_language(const AVStream *pStream);
 std::string get_codec_name(AVCodecContext *pCodecCtx);
diff --git a/demuxer/Demuxers/Packet.cpp b/demuxer/Demuxers/Packet.cpp
index f3e31396..44c01d4b 100644
--- a/demuxer/Demuxers/Packet.cpp
+++ b/demuxer/Demuxers/Packet.cpp
@@ -21,16 +21,6 @@
 #include "Packet.h"
 
 Packet::Packet()
-  : pmt(NULL)
-  , bDiscontinuity(FALSE)
-  , bSyncPoint(FALSE)
-  , rtStart(INVALID_TIME)
-  , rtStop(INVALID_TIME)
-  , bPosition(-1)
-  , dwFlags(0)
-  , m_DataSize(0)
-  , m_Data(NULL)
-  , m_Buf(NULL)
 {
 }
 
diff --git a/demuxer/Demuxers/Packet.h b/demuxer/Demuxers/Packet.h
index 41c7393d..62089360 100644
--- a/demuxer/Demuxers/Packet.h
+++ b/demuxer/Demuxers/Packet.h
@@ -42,21 +42,25 @@ public:
   int RemoveHead(int count);
 
 public:
-  DWORD StreamId;
-  BOOL bDiscontinuity, bSyncPoint;
-  REFERENCE_TIME rtStart, rtStop;
-  LONGLONG bPosition;
-  AM_MEDIA_TYPE* pmt;
+  DWORD StreamId         = 0;
+  BOOL  bDiscontinuity   = FALSE;
+  BOOL  bSyncPoint       = FALSE;
+  LONGLONG bPosition     = -1;
+
+  REFERENCE_TIME rtStart = INVALID_TIME;
+  REFERENCE_TIME rtStop  = INVALID_TIME;
+
+  AM_MEDIA_TYPE *pmt     = nullptr;
 
 #define LAV_PACKET_PARSED           0x0001
 #define LAV_PACKET_MOV_TEXT         0x0002
 #define LAV_PACKET_FORCED_SUBTITLE  0x0004
 #define LAV_PACKET_H264_ANNEXB      0x0008
 #define LAV_PACKET_SRT              0x0010
-  DWORD dwFlags;
+  DWORD dwFlags          = 0;
 
 private:
-  int m_DataSize;
-  BYTE *m_Data;
-  AVBufferRef *m_Buf;
+  int          m_DataSize = 0;
+  BYTE        *m_Data     = nullptr;
+  AVBufferRef *m_Buf      = nullptr;
 };
diff --git a/demuxer/LAVSplitter/InputPin.cpp b/demuxer/LAVSplitter/InputPin.cpp
index 79d8030e..d1b39ef1 100644
--- a/demuxer/LAVSplitter/InputPin.cpp
+++ b/demuxer/LAVSplitter/InputPin.cpp
@@ -26,7 +26,7 @@
 
 
 CLAVInputPin::CLAVInputPin(TCHAR *pName, CLAVSplitter *pFilter, CCritSec *pLock, HRESULT *phr)
-  : CBasePin(pName, pFilter, pLock, phr, L"Input", PINDIR_INPUT), m_pAsyncReader(NULL), m_pAVIOContext(NULL), m_llPos(NULL)
+  : CBasePin(pName, pFilter, pLock, phr, L"Input", PINDIR_INPUT)
 {
 }
 
diff --git a/demuxer/LAVSplitter/InputPin.h b/demuxer/LAVSplitter/InputPin.h
index e2c61d33..dc0e6c38 100644
--- a/demuxer/LAVSplitter/InputPin.h
+++ b/demuxer/LAVSplitter/InputPin.h
@@ -46,10 +46,9 @@ protected:
   static int Read(void *opaque, uint8_t *buf, int buf_size);
   static int64_t Seek(void *opaque, int64_t offset, int whence);
 
-  LONGLONG m_llPos;
+  LONGLONG m_llPos = 0;
 
 private:
-  IAsyncReader *m_pAsyncReader;
-
-  AVIOContext *m_pAVIOContext;
+  IAsyncReader *m_pAsyncReader = nullptr;
+  AVIOContext *m_pAVIOContext  = nullptr;
 };
diff --git a/demuxer/LAVSplitter/LAVSplitter.cpp b/demuxer/LAVSplitter/LAVSplitter.cpp
index c17d1828..57203d6b 100644
--- a/demuxer/LAVSplitter/LAVSplitter.cpp
+++ b/demuxer/LAVSplitter/LAVSplitter.cpp
@@ -46,21 +46,6 @@ void CALLBACK CLAVSplitter::StaticInit(BOOL bLoading, const CLSID *clsid)
 
 CLAVSplitter::CLAVSplitter(LPUNKNOWN pUnk, HRESULT* phr) 
   : CBaseFilter(NAME("lavf dshow source filter"), pUnk, this,  __uuidof(this), phr)
-  , m_rtStart(0)
-  , m_rtStop(0)
-  , m_dRate(1.0)
-  , m_rtLastStart(_I64_MIN)
-  , m_rtLastStop(_I64_MIN)
-  , m_rtCurrent(0)
-  , m_bPlaybackStarted(FALSE)
-  , m_pDemuxer(NULL)
-  , m_bRuntimeConfig(FALSE)
-  , m_pSite(NULL)
-  , m_bFakeASFReader(FALSE)
-  , m_bStopValid(FALSE)
-  , m_rtOffset(0)
-  , m_pTrayIcon(NULL)
-  , m_ePlaybackInit(TRUE)
 {
   WCHAR fileName[1024];
   GetModuleFileName(NULL, fileName, 1024);
diff --git a/demuxer/LAVSplitter/LAVSplitter.h b/demuxer/LAVSplitter/LAVSplitter.h
index 0d596c1a..8529ce0f 100644
--- a/demuxer/LAVSplitter/LAVSplitter.h
+++ b/demuxer/LAVSplitter/LAVSplitter.h
@@ -240,25 +240,30 @@ private:
   std::wstring m_fileName;
   std::wstring m_processName;
 
-  CBaseDemuxer *m_pDemuxer;
+  CBaseDemuxer *m_pDemuxer = nullptr;
 
-  BOOL m_bPlaybackStarted;
-  BOOL m_bFakeASFReader;
+  BOOL m_bPlaybackStarted = FALSE;
+  BOOL m_bFakeASFReader   = FALSE;
 
   // Times
-  REFERENCE_TIME m_rtStart, m_rtStop, m_rtCurrent, m_rtNewStart, m_rtNewStop;
-  REFERENCE_TIME m_rtOffset;
-  double m_dRate;
-  BOOL m_bStopValid;
+  REFERENCE_TIME m_rtStart    = 0;
+  REFERENCE_TIME m_rtStop     = 0;
+  REFERENCE_TIME m_rtCurrent  = 0;
+  REFERENCE_TIME m_rtNewStart = 0;
+  REFERENCE_TIME m_rtNewStop  = 0;
+  REFERENCE_TIME m_rtOffset   = 0;
+  double m_dRate              = 1.0;
+  BOOL m_bStopValid           = FALSE;
 
   // Seeking
-  REFERENCE_TIME m_rtLastStart, m_rtLastStop;
+  REFERENCE_TIME m_rtLastStart = _I64_MIN;
+  REFERENCE_TIME m_rtLastStop  = _I64_MIN;
   std::set<void *> m_LastSeekers;
 
-  CAMEvent m_ePlaybackInit;
+  CAMEvent m_ePlaybackInit{TRUE};
 
   // flushing
-  bool m_fFlushing;
+  bool m_fFlushing      = FALSE;
   CAMEvent m_eEndFlush;
 
   std::set<FormatInfo> m_InputFormats;
@@ -286,11 +291,10 @@ private:
     std::map<std::string, BOOL> formats;
   } m_settings;
 
-  BOOL m_bRuntimeConfig;
+  BOOL m_bRuntimeConfig = FALSE;
 
-  IUnknown *m_pSite;
-
-  CBaseTrayIcon *m_pTrayIcon;
+  IUnknown      *m_pSite     = nullptr;
+  CBaseTrayIcon *m_pTrayIcon = nullptr;
 };
 
 [uuid("B98D13E7-55DB-4385-A33D-09FD1BA26338")]
diff --git a/demuxer/LAVSplitter/LAVSplitterTrayIcon.cpp b/demuxer/LAVSplitter/LAVSplitterTrayIcon.cpp
index 902fa369..d71dbda7 100644
--- a/demuxer/LAVSplitter/LAVSplitterTrayIcon.cpp
+++ b/demuxer/LAVSplitter/LAVSplitterTrayIcon.cpp
@@ -28,8 +28,6 @@
 
 CLAVSplitterTrayIcon::CLAVSplitterTrayIcon(IBaseFilter *pFilter, const WCHAR *wszName, int resIcon)
   : CBaseTrayIcon(pFilter, wszName, resIcon)
-  , m_NumStreams(0)
-  , m_NumChapters(0)
 {
 }
 
diff --git a/demuxer/LAVSplitter/LAVSplitterTrayIcon.h b/demuxer/LAVSplitter/LAVSplitterTrayIcon.h
index 92322b4c..3be5a2da 100644
--- a/demuxer/LAVSplitter/LAVSplitterTrayIcon.h
+++ b/demuxer/LAVSplitter/LAVSplitterTrayIcon.h
@@ -32,6 +32,6 @@ protected:
   HRESULT ProcessMenuCommand(HMENU hMenu, int cmd);
 
 private:
-  int m_NumStreams;
-  int m_NumChapters;
+  int m_NumStreams  = 0;
+  int m_NumChapters = 0;
 };
diff --git a/demuxer/LAVSplitter/OutputPin.cpp b/demuxer/LAVSplitter/OutputPin.cpp
index 23054cde..57ef301d 100644
--- a/demuxer/LAVSplitter/OutputPin.cpp
+++ b/demuxer/LAVSplitter/OutputPin.cpp
@@ -30,20 +30,11 @@
 
 CLAVOutputPin::CLAVOutputPin(std::vector<CMediaType>& mts, LPCWSTR pName, CBaseFilter *pFilter, CCritSec *pLock, HRESULT *phr, CBaseDemuxer::StreamType pinType, const char* container, bool bFirst)
   : CBaseOutputPin(NAME("lavf dshow output pin"), pFilter, pLock, phr, pName)
-  , m_hrDeliver(S_OK)
-  , m_fFlushing(false)
-  , m_fFlushed(false)
-  , m_eEndFlush(TRUE)
   , m_containerFormat(container)
-  , m_newMT(NULL)
   , m_pinType(pinType)
   , m_Parser(this, container)
-  , m_bPacketAllocator(FALSE)
-  , m_dwQueueMaxMem(256)
   , m_bFirstPin(bFirst)
-  , m_nBuffers(1)
   , m_mts(mts)
-  , m_streamId(0)
 {
   m_rtPrev = m_bFirstPin ? 0 : AV_NOPTS_VALUE;
 
diff --git a/demuxer/LAVSplitter/OutputPin.h b/demuxer/LAVSplitter/OutputPin.h
index d3697e84..0ad3b5cb 100644
--- a/demuxer/LAVSplitter/OutputPin.h
+++ b/demuxer/LAVSplitter/OutputPin.h
@@ -117,7 +117,7 @@ public:
 
   void SetQueueSizes();
 
-  REFERENCE_TIME m_rtPrev;
+  REFERENCE_TIME m_rtPrev = AV_NOPTS_VALUE;
 
 protected:
   virtual HRESULT DeliverPacket(Packet *pPacket);
@@ -136,24 +136,25 @@ private:
 
   std::string m_containerFormat;
 
-  bool m_bFirstPin;
+  bool m_bFirstPin = false;
 
   // Flush control
-  bool m_fFlushing, m_fFlushed;
-  CAMEvent m_eEndFlush;
+  bool m_fFlushing = false;
+  bool m_fFlushed  = false;
+  CAMEvent m_eEndFlush{TRUE};
 
-  HRESULT m_hrDeliver;
+  HRESULT m_hrDeliver = S_OK;
 
-  int m_nBuffers;
-  DWORD m_dwQueueLow;
-  DWORD m_dwQueueHigh;
-  DWORD m_dwQueueMaxMem;
+  int m_nBuffers        = 1;
+  DWORD m_dwQueueLow    = MIN_PACKETS_IN_QUEUE;
+  DWORD m_dwQueueHigh   = MAX_PACKETS_IN_QUEUE;
+  DWORD m_dwQueueMaxMem = 256;
 
-  DWORD m_streamId;
-  CMediaType *m_newMT;
+  DWORD m_streamId      = 0;
+  CMediaType *m_newMT   = nullptr;
 
   CBaseDemuxer::StreamType m_pinType;
 
   CStreamParser m_Parser;
-  BOOL m_bPacketAllocator;
+  BOOL m_bPacketAllocator = FALSE;
 };
diff --git a/demuxer/LAVSplitter/PacketAllocator.cpp b/demuxer/LAVSplitter/PacketAllocator.cpp
index af025a58..39c9011b 100644
--- a/demuxer/LAVSplitter/PacketAllocator.cpp
+++ b/demuxer/LAVSplitter/PacketAllocator.cpp
@@ -25,7 +25,6 @@
 
 CMediaPacketSample::CMediaPacketSample(LPCTSTR pName, CBaseAllocator *pAllocator, HRESULT *phr)
   : CMediaSample(pName, pAllocator, phr)
-  , m_pPacket(NULL)
 {
 }
 
@@ -89,7 +88,6 @@ STDMETHODIMP CMediaPacketSample::SetPacket(Packet *pPacket)
 
 CPacketAllocator::CPacketAllocator(LPCTSTR pName, LPUNKNOWN pUnk, HRESULT *phr)
   : CBaseAllocator(pName, pUnk, phr, TRUE, TRUE)
-  , m_bAllocated(FALSE)
 {
 }
 
diff --git a/demuxer/LAVSplitter/PacketAllocator.h b/demuxer/LAVSplitter/PacketAllocator.h
index 9d8566bb..b6e89901 100644
--- a/demuxer/LAVSplitter/PacketAllocator.h
+++ b/demuxer/LAVSplitter/PacketAllocator.h
@@ -41,13 +41,13 @@ public:
   STDMETHODIMP SetPacket(Packet *pPacket);
 
 protected:
-  Packet *m_pPacket;
+  Packet *m_pPacket = nullptr;
 };
 
 class CPacketAllocator : public CBaseAllocator
 {
 protected:
-  BOOL m_bAllocated;
+  BOOL m_bAllocated = FALSE;
 
   // override to free the memory when decommit completes
   // - we actually do nothing, and save the memory until deletion.
diff --git a/demuxer/LAVSplitter/PacketQueue.h b/demuxer/LAVSplitter/PacketQueue.h
index ab0baeaf..973522e0 100644
--- a/demuxer/LAVSplitter/PacketQueue.h
+++ b/demuxer/LAVSplitter/PacketQueue.h
@@ -33,7 +33,7 @@ class Packet;
 class CPacketQueue : public CCritSec
 {
 public:
-  CPacketQueue() : m_dataSize(0) {};
+  CPacketQueue() {};
 
   // Queue a new packet at the end of the list
   void Queue(Packet *pPacket);
@@ -57,10 +57,10 @@ public:
 private:
   // The actual storage class
   std::deque<Packet *> m_queue;
-  size_t m_dataSize;
+  size_t m_dataSize = 0;
 
 #ifdef DEBUG
-  bool m_bWarnedFull;
-  bool m_bWarnedExtreme;
+  bool m_bWarnedFull    = false;
+  bool m_bWarnedExtreme = false;
 #endif
 };
diff --git a/demuxer/LAVSplitter/SettingsProp.cpp b/demuxer/LAVSplitter/SettingsProp.cpp
index 5693e241..808de9e1 100644
--- a/demuxer/LAVSplitter/SettingsProp.cpp
+++ b/demuxer/LAVSplitter/SettingsProp.cpp
@@ -31,10 +31,6 @@
 
 CLAVSplitterSettingsProp::CLAVSplitterSettingsProp(LPUNKNOWN pUnk, HRESULT* phr)
   : CBaseDSPropPage(NAME("LAVF Settings"), pUnk, IDD_PROPPAGE_LAVFSETTINGS, IDS_PAGE_TITLE)
-  , m_pLAVF(NULL)
-  , m_pszPrefLang(NULL)
-  , m_pszPrefSubLang(NULL)
-  , m_pszAdvSubConfig(NULL)
 {
 }
 
@@ -397,7 +393,6 @@ INT_PTR CLAVSplitterSettingsProp::OnReceiveMessage(HWND hwnd, UINT uMsg, WPARAM
 
 CLAVSplitterFormatsProp::CLAVSplitterFormatsProp(LPUNKNOWN pUnk, HRESULT* phr)
   : CBaseDSPropPage(NAME("LAVF Settings"), pUnk, IDD_PROPPAGE_FORMATS, IDS_INPUT_FORMATS)
-  , m_pLAVF(NULL), m_bFormats(NULL)
 {
 }
 
diff --git a/demuxer/LAVSplitter/SettingsProp.h b/demuxer/LAVSplitter/SettingsProp.h
index 577ba792..aab29cc4 100644
--- a/demuxer/LAVSplitter/SettingsProp.h
+++ b/demuxer/LAVSplitter/SettingsProp.h
@@ -58,12 +58,12 @@ private:
   }
 
 private:
-  ILAVFSettingsInternal *m_pLAVF;
+  ILAVFSettingsInternal *m_pLAVF = nullptr;
 
   // Settings
-  WCHAR *m_pszPrefLang;
-  WCHAR *m_pszPrefSubLang;
-  WCHAR *m_pszAdvSubConfig;
+  WCHAR *m_pszPrefLang     = nullptr;
+  WCHAR *m_pszPrefSubLang  = nullptr;
+  WCHAR *m_pszAdvSubConfig = nullptr;
 
   LAVSubtitleMode m_subtitleMode;
   BOOL m_PGSForcedStream;
@@ -110,10 +110,10 @@ private:
   }
 
 private:
-  ILAVFSettingsInternal *m_pLAVF;
+  ILAVFSettingsInternal *m_pLAVF = nullptr;
 
   std::set<FormatInfo> m_Formats;
-  BOOL *m_bFormats;
+  BOOL *m_bFormats = nullptr;
 
   WCHAR stringBuffer[256];
 };
diff --git a/demuxer/LAVSplitter/StreamParser.cpp b/demuxer/LAVSplitter/StreamParser.cpp
index 9d901a71..cd7b1ce9 100644
--- a/demuxer/LAVSplitter/StreamParser.cpp
+++ b/demuxer/LAVSplitter/StreamParser.cpp
@@ -39,7 +39,7 @@ extern "C" {
 //#define DEBUG_PGS_PARSER
 
 CStreamParser::CStreamParser(CLAVOutputPin *pPin, const char *szContainer)
-  : m_pPin(pPin), m_strContainer(szContainer), m_pPacketBuffer(NULL), m_gSubtype(GUID_NULL), m_bPGSDropState(FALSE), m_bHasAccessUnitDelimiters(false)
+  : m_pPin(pPin), m_strContainer(szContainer)
 {
 
 }
diff --git a/demuxer/LAVSplitter/StreamParser.h b/demuxer/LAVSplitter/StreamParser.h
index dac23433..49f06065 100644
--- a/demuxer/LAVSplitter/StreamParser.h
+++ b/demuxer/LAVSplitter/StreamParser.h
@@ -46,18 +46,17 @@ private:
   HRESULT Queue(Packet *pPacket) const;
 
 private:
-  CLAVOutputPin * const m_pPin;
+  CLAVOutputPin * const m_pPin = nullptr;
   std::string m_strContainer;
 
-  GUID m_gSubtype;
+  GUID m_gSubtype = GUID_NULL;
 
-  Packet *m_pPacketBuffer;
+  Packet *m_pPacketBuffer = nullptr;
 
-  BOOL m_bPGSDropState;
+  BOOL m_bPGSDropState = FALSE;
   GrowableArray<BYTE> m_pgsBuffer;
 
   CPacketQueue m_queue;
 
-  bool m_bHasAccessUnitDelimiters;
+  bool m_bHasAccessUnitDelimiters = false;
 };
-