[vlc-commits] hls: uint8_t is available in the global namespace

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Oct 12 16:48:00 2017 +0200| [4ab384a7d77f568006dc782fe80eccec60f49942] | committer: Hugo Beauzée-Luyssen

hls: uint8_t is available in the global namespace

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4ab384a7d77f568006dc782fe80eccec60f49942
---

 modules/demux/hls/playlist/M3U8.cpp | 8 ++++----
 modules/demux/hls/playlist/M3U8.hpp | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/demux/hls/playlist/M3U8.cpp b/modules/demux/hls/playlist/M3U8.cpp
index 1d2ec2b5ac..cbdb2ff660 100644
--- a/modules/demux/hls/playlist/M3U8.cpp
+++ b/modules/demux/hls/playlist/M3U8.cpp
@@ -45,12 +45,12 @@ M3U8::~M3U8()
     vlc_mutex_destroy(&keystore_lock);
 }
 
-std::vector<std::uint8_t> M3U8::getEncryptionKey(const std::string &uri)
+std::vector<uint8_t> M3U8::getEncryptionKey(const std::string &uri)
 {
-    std::vector<std::uint8_t> key;
+    std::vector<uint8_t> key;
 
     vlc_mutex_lock( &keystore_lock );
-    std::map<std::string, std::vector<std::uint8_t>>::iterator it = keystore.find(uri);
+    std::map<std::string, std::vector<uint8_t> >::iterator it = keystore.find(uri);
     if(it == keystore.end())
     {
         /* Pretty bad inside the lock */
@@ -61,7 +61,7 @@ std::vector<std::uint8_t> M3U8::getEncryptionKey(const std::string &uri)
             {
                 key.resize(16);
                 memcpy(&key[0], p_block->p_buffer, 16);
-                keystore.insert(std::pair<std::string, std::vector<std::uint8_t>>(uri, key));
+                keystore.insert(std::pair<std::string, std::vector<uint8_t> >(uri, key));
             }
             block_Release(p_block);
         }
diff --git a/modules/demux/hls/playlist/M3U8.hpp b/modules/demux/hls/playlist/M3U8.hpp
index 4f656e5f17..95398994c8 100644
--- a/modules/demux/hls/playlist/M3U8.hpp
+++ b/modules/demux/hls/playlist/M3U8.hpp
@@ -37,14 +37,14 @@ namespace hls
                 M3U8(vlc_object_t *);
                 virtual ~M3U8();
 
-                std::vector<std::uint8_t>       getEncryptionKey(const std::string &);
+                std::vector<uint8_t>            getEncryptionKey(const std::string &);
                 virtual bool                    isLive() const;
                 virtual void                    debug();
 
             private:
                 std::string data;
                 vlc_mutex_t keystore_lock;
-                std::map<std::string, std::vector<std::uint8_t>> keystore;
+                std::map<std::string, std::vector<uint8_t> > keystore;
         };
     }
 }