Merge branch 'avsychronize'

Conflicts:
	jni/ffmpeg-jni.c
add tmp