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

zhangmeng

2019-12-30 1ca362aaad94f5017fa4607a881b80ef327679ba

 .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