Fix typo (didn't affect OBE-RT)
Merge branch 'master' of git://git.videolan.org/x264
Revert "Sliced-threads: do hpel and deblock after returning"

This reverts commit c522ad1fed167d0e985e4f9dcdee042473cf74db.
Merge branch 'master' of git://git.videolan.org/x264
Merge git://github.com/DarkShikari/x264-devel
Revert "Fix clobbering of mutex/cvs"

This reverts commit 5c85e0a2b7992fcaab09418e3fcefc613cffc743.
Fix build temporarily.
Fix intra-refresh + hrd.
Sliced-threads: do hpel and deblock after returning
Lowers encoding latency around 14% in sliced threads mode with preset superfast.
Additionally, even if there is no waiting time between frames, this improves parallelism, because hpel+deblock are done during the (singlethreaded) lookahead.
For ease of debugging, dump-yuv forces all of the threads to wait and finish instead of setting b_full_recon.
Fix clobbering of mutex/cvs
Regression in r2183.
Bizarrely seemed to work on many platforms, but crashed on win64 and may have been slower.
Only affected sliced threads during encoding, but could cause crashes on x264 encoder close even without sliced threads.
Merge git://github.com/DarkShikari/x264-devel

Conflicts:
	encoder/encoder.c
Move the pir_offset code back to its original place.
Turn down verbosity of speedcontrol
Add ability to signal to x264 when speedcontrol buffering is complete
Set the default number of presets to be used to the maximum
Revert "Pre-place keyframes to fix long stalls when PB... becomes IP... and a new path"

This reverts commit 168a2afbf68551cb34ce1a2c53490dfeb12cbb69.

Conflicts:

	encoder/slicetype.c
Merge x264 git
Merge branch 'master' of git://git.videolan.org/x264 into newmerge

Conflicts:
	common/arm/quant-a.S
	configure
Merge branch 'newmerge' of github.com:kierank/x264-obe into obe

Conflicts:
	encoder/encoder.c
Temporarily disable speedcontrol for x262. Causes a lot of artefacts.