Merge branch 'master' of github.com:pkendall64/libvdpau-odroid

Conflicts:
	device.c
	presentation_queue.c
	shader.h
	surface_video.c
	vdpau_private.h