selim/ffconv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26 Commits 1 Branch 0 Tags 168 KiB
C++ 82.2%
CMake 17.8%
4392ebea1c
Go to file
selim mustafaev 4392ebea1c Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	examples/ffPlayer.cpp
2017-11-06 17:08:08 +03:00
cmake/modules add support for building with Visual Studio 2017 2017-08-13 14:28:36 -07:00
examples Merge remote-tracking branch 'origin/master' 2017-11-06 17:08:08 +03:00
include/ffcpp Merge remote-tracking branch 'origin/master' 2017-11-06 17:08:08 +03:00
src Merge remote-tracking branch 'origin/master' 2017-11-06 17:08:08 +03:00
.gitignore add support for building with Visual Studio 2017 2017-08-13 14:28:36 -07:00
CMakeLists.txt Merge remote-tracking branch 'origin/master' 2017-11-06 17:08:08 +03:00