From 963075386118ac0da1404192d4c8ee4a51813cd7 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Tue, 18 Mar 2014 19:11:53 -0400
Subject: COMMON: Move some QuickTime Track variables into SampleDesc where
 they belong

---
 common/quicktime.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'common/quicktime.h')

diff --git a/common/quicktime.h b/common/quicktime.h
index caa92578b1..f5fd578e3a 100644
--- a/common/quicktime.h
+++ b/common/quicktime.h
@@ -108,10 +108,13 @@ protected:
 	class SampleDesc {
 	public:
 		SampleDesc(Track *parentTrack, uint32 codecTag);
-		virtual ~SampleDesc() {}
+		virtual ~SampleDesc();
 
 		uint32 getCodecTag() const { return _codecTag; }
 
+		SeekableReadStream *_extraData;
+		byte _objectTypeMP4;
+
 	protected:
 		Track *_parentTrack;
 		uint32 _codecTag;
@@ -150,16 +153,12 @@ protected:
 		uint32 editCount;
 		EditListEntry *editList;
 
-		SeekableReadStream *extraData;
-
 		uint32 frameCount;
 		uint32 duration;
 		uint32 mediaDuration;
 		uint32 startTime;
 		Rational scaleFactorX;
 		Rational scaleFactorY;
-
-		byte objectTypeMP4;
 	};
 
 	virtual SampleDesc *readSampleDesc(Track *track, uint32 format, uint32 descSize) = 0;
-- 
cgit v1.2.3