1 files changed, 5 insertions, 7 deletions
diff --git a/common/rfb/H264Decoder.h b/common/rfb/H264Decoder.h
index 8ba47799..bc1b9281 100644
--- a/common/rfb/H264Decoder.h
+++ b/common/rfb/H264Decoder.h
@@ -21,9 +21,8 @@
 #ifndef __RFB_H264DECODER_H__
 #define __RFB_H264DECODER_H__
 
-#include <deque>
+#include <list>
 
-#include <os/Mutex.h>
 #include <rfb/Decoder.h>
 
 namespace rfb {
@@ -33,19 +32,18 @@ namespace rfb {
   public:
     H264Decoder();
     virtual ~H264Decoder();
-    bool readRect(const Rect& r, rdr::InStream* is,
+    bool readRect(const core::Rect& r, rdr::InStream* is,
                   const ServerParams& server,
                   rdr::OutStream* os) override;
-    void decodeRect(const Rect& r, const uint8_t* buffer,
+    void decodeRect(const core::Rect& r, const uint8_t* buffer,
                     size_t buflen, const ServerParams& server,
                     ModifiablePixelBuffer* pb) override;
 
   private:
     void resetContexts();
-    H264DecoderContext* findContext(const Rect& r);
+    H264DecoderContext* findContext(const core::Rect& r);
 
-    os::Mutex mutex;
-    std::deque<H264DecoderContext*> contexts;
+    std::list<H264DecoderContext*> contexts;
   };
 }