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

chenshijun

2019-12-03 f29f269d999fc4bb8a9bfa85629f08b89971a2ef

 .gitignore

@@ -5,17 +5,22 @@
*.obj

# Compiled Dynamic libraries
*.so
#*.so
*.dylib
*.dll

# Compiled Static libraries
*.lai
*.la
*.a
#*.a
*.lib

# Executables
*.exe
*.out
*.app

/build
build*
.idea
.vscode