Skip to content

Tags: Maxlander/android-gpuimage-plus

Tags

no_ffmpeg

Toggle no_ffmpeg's commit message
Merge branch 'master' of https://bitbucket.org/wysaid/android-gpuimag…

…e-plus

# Conflicts:
#	library/src/main/java/org/wysaid/view/CameraGLSurfaceView.java