[FFmpeg-cvslog] Merge commit 'b21af32aed7e343f962753943e9f16baedfb1750'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Mar 24 02:06:44 2015 +0100| [2850131f2c7abaede32b39ed6eaeecfbf77e6042] | committer: Michael Niedermayer

Merge commit 'b21af32aed7e343f962753943e9f16baedfb1750'

* commit 'b21af32aed7e343f962753943e9f16baedfb1750':
  lavc: Prefer x264 over openh264 if both libraries are available

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

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