Merge remote-tracking branch 'x264/master' into audio_new

Conflicts:
	configure
	version.sh
	x264.c
Update enc_lavc to build with libavcodec 54