Merge remote-tracking branch 'upstream/master' into master

src/Common/MediaSink.cpp

@@ -161,7 +161,7 @@ vector<Track::Ptr> MediaSink::getTracks(bool trackReady) const{
         }
         ret.emplace_back(pr.second);
     }
-    return std::move(ret);
+    return ret;
 }
 
 

src/Http/HttpBody.cpp

@@ -135,7 +135,7 @@ Buffer::Ptr HttpFileBody::readData(uint32_t size) {
             //读到数据了
             ret->setSize(iRead);
             _offset += iRead;
-            return std::move(ret);
+            return ret;
         }
         //读取文件异常，文件真实长度小于声明长度
         _offset = _max_size;
@@ -146,7 +146,7 @@ Buffer::Ptr HttpFileBody::readData(uint32_t size) {
     //mmap模式
     auto ret = std::make_shared<BufferMmap>(_map_addr,_offset,size);
     _offset += size;
-    return std::move(ret);
+    return ret;
 }
 
 //////////////////////////////////////////////////////////////////

src/Http/HttpFileManager.cpp

@@ -592,7 +592,7 @@ static string getFilePath(const Parser &parser,const MediaInfo &mediaInfo, TcpSe
     GET_CONFIG(string, rootPath, Http::kRootPath);
     auto ret = File::absolutePath(enableVhost ? mediaInfo._vhost + parser.Url() : parser.Url(), rootPath);
     NoticeCenter::Instance().emitEvent(Broadcast::kBroadcastHttpBeforeAccess, parser, ret, static_cast<SockInfo &>(sender));
-    return std::move(ret);
+    return ret;
 }
 
 /**

src/Player/PlayerBase.cpp

@@ -105,7 +105,7 @@ vector<Track::Ptr> Demuxer::getTracks(bool trackReady) const {
             ret.emplace_back(_audioTrack);
         }
     }
-    return std::move(ret);
+    return ret;
 }
 
 float Demuxer::getDuration() const {

src/Record/MP4Demuxer.cpp

@@ -275,7 +275,7 @@ vector<Track::Ptr> MP4Demuxer::getTracks(bool trackReady) const {
         }
         ret.push_back(pr.second);
     }
-    return std::move(ret);
+    return ret;
 }
 
 uint64_t MP4Demuxer::getDurationMS() const {

src/Rtsp/Rtsp.cpp

@@ -286,7 +286,7 @@ vector<SdpTrack::Ptr> SdpParser::getAvailableTrack() const {
             continue;
         }
     }
-    return std::move(ret);
+    return ret;
 }
 
 string SdpParser::toString() const {