From 2beb4b02aa35ff5b94304d32052f26b34b09056f Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sat, 10 Jun 2017 21:46:25 +0200
Subject: [PATCH] Prevent some warnings

---
 avc/avcinfo.h        | 38 ++++++++++++++++++--------------------
 mp4/mp4container.cpp |  6 +++---
 mp4/mp4track.h       |  2 +-
 3 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/avc/avcinfo.h b/avc/avcinfo.h
index 3ae9c2f..b4eb987 100644
--- a/avc/avcinfo.h
+++ b/avc/avcinfo.h
@@ -167,30 +167,28 @@ inline SliceInfo::SliceInfo() :
     pps(0)
 {}
 
-class TAG_PARSER_EXPORT AvcFrame {
+struct TAG_PARSER_EXPORT AvcFrame {
     AvcFrame();
-
-private:
-    uint64 m_start;
-    uint64 m_end;
-    uint64 m_ref1;
-    uint64 m_ref2;
-    bool m_keyframe;
-    bool m_hasProvidedTimecode;
-    SliceInfo m_sliceInfo;
-    uint32 m_presentationOrder;
-    uint32 m_decodeOrder;
+    uint64 start;
+    uint64 end;
+    uint64 ref1;
+    uint64 ref2;
+    bool keyframe;
+    bool hasProvidedTimecode;
+    SliceInfo sliceInfo;
+    uint32 presentationOrder;
+    uint32 decodeOrder;
 };
 
 inline AvcFrame::AvcFrame() :
-    m_start(0),
-    m_end(0),
-    m_ref1(0),
-    m_ref2(0),
-    m_keyframe(false),
-    m_hasProvidedTimecode(false),
-    m_presentationOrder(0),
-    m_decodeOrder(0)
+    start(0),
+    end(0),
+    ref1(0),
+    ref2(0),
+    keyframe(false),
+    hasProvidedTimecode(false),
+    presentationOrder(0),
+    decodeOrder(0)
 {}
 
 
diff --git a/mp4/mp4container.cpp b/mp4/mp4container.cpp
index bd0c914..d77f477 100644
--- a/mp4/mp4container.cpp
+++ b/mp4/mp4container.cpp
@@ -262,7 +262,7 @@ void Mp4Container::internalMakeFile()
     const auto trackCount = this->trackCount();
 
     // find relevant atoms in original file
-    Mp4Atom *fileTypeAtom, *progressiveDownloadInfoAtom, *movieAtom, *firstMediaDataAtom, *firstMovieFragmentAtom, *userDataAtom;
+    Mp4Atom *fileTypeAtom, *progressiveDownloadInfoAtom, *movieAtom, *firstMediaDataAtom, *firstMovieFragmentAtom/*, *userDataAtom*/;
     Mp4Atom *level0Atom, *level1Atom, *level2Atom, *lastAtomToBeWritten;
     try {
         // file type atom (mandatory)
@@ -334,8 +334,8 @@ void Mp4Container::internalMakeFile()
             initialNewTagPos = newTagPos = ElementPosition::BeforeData;
         }
 
-        // user data atom
-        userDataAtom = movieAtom->childById(Mp4AtomIds::UserData);
+        // user data atom (currently not used)
+        //userDataAtom = movieAtom->childById(Mp4AtomIds::UserData);
 
     } catch (const NotImplementedException &) {
         throw;
diff --git a/mp4/mp4track.h b/mp4/mp4track.h
index 1a53404..dd992f0 100644
--- a/mp4/mp4track.h
+++ b/mp4/mp4track.h
@@ -11,7 +11,7 @@ namespace Media
 
 class Mp4Atom;
 class Mpeg4Descriptor;
-class AvcConfiguration;
+struct AvcConfiguration;
 
 class TAG_PARSER_EXPORT Mpeg4AudioSpecificConfig
 {