* commit '0ef256d5':
  libx264: Correctly manage constant rate factor params

Conflicts:
	libavcodec/libx264.c

See: 3a1c8951Merged-by: Michael Niedermayer <michaelni@gmx.at>