reverse yesterday
Merge branch 'master' of https://github.com/dalvik/Drovik

Conflicts:
	jni/ffmpeg-jni.c
Merge branch 'master' of https://github.com/dalvik/Drovik
Merge branch 'master' of https://github.com/dalvik/Drovik
remove some usedless code