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

chenshijun

2019-07-17 803388b511d31b9e25f6829298bb12e06323474c

 csrc/ffmpeg/format/FormatOut.cpp

@@ -160,6 +160,9 @@
        if(prop.gpuAccl()){
            av_opt_set(enc_ctx_->priv_data, "preset", "llhp", 0);
            int idle_gpu = gpu::getGPU(120);
            if (prop.gpu_index_ > -1){
                idle_gpu = prop.gpu_index_;
            }
            if(idle_gpu < 0){
                logIt("NO GPU RESOURCE TO ENCODE");
                return false;