CDecWMV9/CDecWMV9MFT: Do not declare conflicting types in headers.

Move struct declaration inside class so they are in proper namespace.
This fixes errors with a few analyzers. Apparently compiler/analyzer
were confused by the same struct name in two components.

2 files changed, 12 insertions, 12 deletions

diff --git a/decoder/LAVVideo/decoders/wmv9.h b/decoder/LAVVideo/decoders/wmv9.h
index d41ec670..c2182431 100644
--- a/decoder/LAVVideo/decoders/wmv9.h
+++ b/decoder/LAVVideo/decoders/wmv9.h
@@ -27,14 +27,14 @@
 
 class CVC1HeaderParser;
 
-typedef struct _Buffer {
-  BYTE *buffer = nullptr;
-  size_t size  = 0;
-  bool used    = false;
-} Buffer;
-
 class CDecWMV9 : public CDecBase
 {
+  typedef struct _Buffer {
+    BYTE *buffer = nullptr;
+    size_t size  = 0;
+    bool used    = false;
+  } Buffer;
+
 public:
   CDecWMV9(void);
   virtual ~CDecWMV9(void);
diff --git a/decoder/LAVVideo/decoders/wmv9mft.h b/decoder/LAVVideo/decoders/wmv9mft.h
index d3855877..a4dc00a1 100644
--- a/decoder/LAVVideo/decoders/wmv9mft.h
+++ b/decoder/LAVVideo/decoders/wmv9mft.h
@@ -45,14 +45,14 @@ typedef HRESULT STDAPICALLTYPE tMFAverageTimePerFrameToFrameRate(UINT64 unAverag
 
 class CVC1HeaderParser;
 
-typedef struct _Buffer {
-  IMFMediaBuffer *pBuffer = nullptr;
-  DWORD size              = 0;
-  bool used               = false;
-} Buffer;
-
 class CDecWMV9MFT : public CDecBase
 {
+  typedef struct _Buffer {
+    IMFMediaBuffer *pBuffer = nullptr;
+    DWORD size              = 0;
+    bool used               = false;
+  } Buffer;
+
 public:
   CDecWMV9MFT(void);
   virtual ~CDecWMV9MFT(void);