Merge branch 'master' of ssh://192.168.1.14:29418/valib/goffmpeg

zhangmeng

2019-09-20 a2a03e83609a570428d0dce35ef649353b5796aa

 csrc/worker/decoder.cpp

@@ -66,6 +66,7 @@

    int decoder::SetFrame(std::shared_ptr<ffwrapper::CodedData> data, int64_t &id){
        if (!data) return -1;
        if (decRef_->isAudioPkt(data->getAVPacket())) return -2;
        
        if (!conv_){
            initDecoder();