[FFmpeg-cvslog] Merge commit '03ca6d70df192125a772dadd01acfe3905aa653f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 15 21:56:26 2015 +0200| [4ed3a01d717f120ba6881815ad6c40ad3f625825] | committer: Michael Niedermayer

Merge commit '03ca6d70df192125a772dadd01acfe3905aa653f'

* commit '03ca6d70df192125a772dadd01acfe3905aa653f':
  x264: Factor out the reconfiguration code

Conflicts:
	libavcodec/libx264.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ed3a01d717f120ba6881815ad6c40ad3f625825
---